Skip to content

Commit

Permalink
starting dev branch for 2.11 line
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasSUSE committed Nov 26, 2024
1 parent e61d116 commit 74ee11e
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/regsync-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generate-Regsync-Config action will run for every PR into release-v2.10 branch only after an approval is given
# Generate-Regsync-Config action will run for every PR into release-v2.11 branch only after an approval is given
# It will run make target to generate regsync file and add a commit to the PR updating the regsync file.
# It will then install and run regsync client and do the prime image mirroring.

Expand Down
2 changes: 1 addition & 1 deletion configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ helmRepo:

validate:
url: https://github.com/rancher/charts.git
branch: release-v2.10
branch: release-v2.11
2 changes: 1 addition & 1 deletion scripts/release-validation/diff-with-released.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ROOT_DIR=../..
UPSTREAM_REMOTE=upstream
UPSTREAM_BRANCH=release-v2.10
UPSTREAM_BRANCH=release-v2.11
OLD_CHART_DIR=$ROOT_DIR/charts
NEW_CHART_DIR=$ROOT_DIR/to-be-released

Expand Down
2 changes: 1 addition & 1 deletion scripts/release-validation/last-released.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ALREADY_RELEASED=$ROOT_DIR/already-released
RELEASE_YAML_PATH=$ROOT_DIR/release.yaml

UPSTREAM_REMOTE=upstream
UPSTREAM_BRANCH=release-v2.10
UPSTREAM_BRANCH=release-v2.11

git fetch ${UPSTREAM_REMOTE}
mv $CHART_DIR $TO_BE_RELEASED
Expand Down
4 changes: 2 additions & 2 deletions scripts/release-validation/validate-annotations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ROOT_DIR=../..
ASSETS_DIR=$ROOT_DIR/assets
INDEX_PATH=$ROOT_DIR/index.yaml
UPSTREAM_REMOTE=upstream
UPSTREAM_BRANCH=release-v2.10
OLD_UPSTREAM_BRANCH=release-v2.9
UPSTREAM_BRANCH=release-v2.11
OLD_UPSTREAM_BRANCH=release-v2.10

git fetch ${UPSTREAM_REMOTE}

Expand Down
2 changes: 1 addition & 1 deletion scripts/version
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set -e

CHARTS_BUILD_SCRIPTS_REPO=https://github.com/rancher/charts-build-scripts.git
CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v1.1.0}"
CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v1.2.0}"
4 changes: 4 additions & 0 deletions version_rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"prod-branch-prefix": "release-v",
"dev-branch-prefix": "dev-v",
"rules": {
"2.11": {
"min": "106.0.0",
"max": "107.0.0"
},
"2.10": {
"min": "105.0.0",
"max": "106.0.0"
Expand Down

0 comments on commit 74ee11e

Please sign in to comment.