Skip to content

Commit 1759e3a

Browse files
authored
[main] Bump RPM version and generate (#256)
* Bump RPM version and generate * fix bug w/ dev branch builds
1 parent efff7a3 commit 1759e3a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
rancherProjectMonitoringVersion: 0.5.1
1+
rancherProjectMonitoringVersion: 0.5.2
22
rancherMonitoringVersion : latest
33
k3sTestingMaxVersion: v1.32.1+k3s1
44
k3sTestingMinVersion: v1.30.9+k3s1
55

66
# Dev use only
77
# devChartsSource: https://github.com/{Dev}/ob-team-charts
8-
# devChartsBranch: {your branch}
8+
# devChartsBranch: {your branch}

pkg/buildconfig/constants.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/util-team-charts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ CHARTS_REPO="https://raw.githubusercontent.com/rancher/ob-team-charts"
66
CHARTS_BRANCH="main"
77

88
if grep -v "^#" "$BUILD_YAML_PATH"| grep 'devChartsSource'; then
9-
TMP_CHARTS_REPO=$(grep 'devChartsSource' "$BUILD_YAML_PATH"|cut -d" " -f2|tr -d ' ')
9+
TMP_CHARTS_REPO=$(grep -v "^#" "$BUILD_YAML_PATH" | grep 'devChartsSource' |cut -d" " -f2|tr -d ' ')
1010
CHARTS_REPO=$(echo "$TMP_CHARTS_REPO" | sed 's/github\.com/raw\.githubusercontent\.com/g')
1111
fi
1212
if grep -v "^#" "$BUILD_YAML_PATH"| grep 'devChartsBranch'; then
13-
CHARTS_BRANCH=$(grep 'devChartsBranch' "$BUILD_YAML_PATH"|cut -d: -f2|tr -d ' ')
13+
CHARTS_BRANCH=$(grep -v "^#" "$BUILD_YAML_PATH" | grep 'devChartsBranch' |cut -d: -f2|tr -d ' ')
1414
fi
1515

1616

0 commit comments

Comments
 (0)