From 7bdefd065fc2ee031f2800ec386546476bf3ad3c Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 11 Aug 2023 11:11:58 +0200 Subject: [PATCH 1/3] chore: update scripts, workflows and documentation to support release-52 --- .github/pull_request_template.md | 2 +- .github/workflows/_push-entrypoint.yaml | 1 + .github/workflows/build_packages_cron.yaml | 1 + scripts/rel/cut.sh | 14 +++++++++++++- scripts/rel/sync-remotes.sh | 12 ++++++++---- scripts/shelltest/parse-git-ref.test | 5 +++++ 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d75661a8a..0c4fe2765 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,6 @@ Fixes - + ## Summary copilot:summary diff --git a/.github/workflows/_push-entrypoint.yaml b/.github/workflows/_push-entrypoint.yaml index 32f3ae15a..9ef517ab9 100644 --- a/.github/workflows/_push-entrypoint.yaml +++ b/.github/workflows/_push-entrypoint.yaml @@ -12,6 +12,7 @@ on: branches: - 'master' - 'release-51' + - 'release-52' - 'ci/**' env: diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml index b245078da..f9a0c70a1 100644 --- a/.github/workflows/build_packages_cron.yaml +++ b/.github/workflows/build_packages_cron.yaml @@ -24,6 +24,7 @@ jobs: profile: - ['emqx', 'master'] - ['emqx-enterprise', 'release-51'] + - ['emqx-enterprise', 'release-52'] otp: - 25.3.2-1 arch: diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index b44acd03f..7e0c25409 100755 --- a/scripts/rel/cut.sh +++ b/scripts/rel/cut.sh @@ -21,6 +21,7 @@ options: -b|--base: Specify the current release base branch, can be one of release-51 + release-52 NOTE: this option should be used when --dryrun. --dryrun: Do not actually create the git tag. @@ -35,10 +36,15 @@ options: in addition to regular : one -NOTE: For 5.1 series the current working branch must be 'release-51' +For 5.1 series the current working branch must be 'release-51' --.--[ master ]---------------------------.-----------.--- \\ / \`---[release-51]----(v5.1.1 | e5.1.1) + +For 5.2 series the current working branch must be 'release-52' + --.--[ master ]---------------------------.-----------.--- + \\ / + \`---[release-52]----(v5.2.1 | e5.2.1) EOF } @@ -133,6 +139,12 @@ rel_branch() { e5.1.*) echo 'release-51' ;; + v5.2.*) + echo 'release-52' + ;; + e5.2.*) + echo 'release-52' + ;; *) logerr "Unsupported version tag $TAG" exit 1 diff --git a/scripts/rel/sync-remotes.sh b/scripts/rel/sync-remotes.sh index f4cbadfa1..dddc10638 100755 --- a/scripts/rel/sync-remotes.sh +++ b/scripts/rel/sync-remotes.sh @@ -5,7 +5,7 @@ set -euo pipefail # ensure dir cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." -BASE_BRANCHES=( 'release-51' 'master' ) +BASE_BRANCHES=( 'release-52' 'release-51' 'master' ) usage() { cat <>>= 0 +./parse-git-ref.sh refs/heads/release-52 +>>> +{"profile": "emqx-enterprise", "release": false, "latest": false} +>>>= 0 + ./parse-git-ref.sh refs/heads/ci/foobar >>> {"profile": "emqx", "release": false, "latest": false} From 659647955a91e04c3f58592cb961e090d058ddc5 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 11 Aug 2023 11:15:50 +0200 Subject: [PATCH 2/3] chore: remove support for docker-latest-* tag from cut.sh --- scripts/rel/cut.sh | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index 7e0c25409..f779a12b9 100755 --- a/scripts/rel/cut.sh +++ b/scripts/rel/cut.sh @@ -32,9 +32,6 @@ options: --prev-tag : Provide the prev tag to automatically generate changelogs If this option is absent, the tag found by git describe will be used - --docker-latest: Set this option to assign :latest tag on the corresponding docker image - in addition to regular : one - For 5.1 series the current working branch must be 'release-51' --.--[ master ]---------------------------.-----------.--- @@ -61,21 +58,18 @@ logmsg() { } TAG="${1:-}" -DOCKER_LATEST_TAG= case "$TAG" in v*) TAG_PREFIX='v' PROFILE='emqx' SKIP_APPUP='yes' - DOCKER_LATEST_TAG='docker-latest-ce' ;; e*) TAG_PREFIX='e' PROFILE='emqx-enterprise' #TODO change to no when we are ready to support hot-upgrade SKIP_APPUP='yes' - DOCKER_LATEST_TAG='docker-latest-ee' ;; -h|--help) usage @@ -91,7 +85,6 @@ esac shift 1 DRYRUN='no' -DOCKER_LATEST='no' while [ "$#" -gt 0 ]; do case $1 in -h|--help) @@ -119,10 +112,6 @@ while [ "$#" -gt 0 ]; do PREV_TAG="$1" shift ;; - --docker-latest) - DOCKER_LATEST='yes' - shift - ;; *) logerr "Unknown option $1" exit 1 @@ -266,9 +255,6 @@ generate_changelog () { if [ "$DRYRUN" = 'yes' ]; then logmsg "Release tag is ready to be created with command: git tag $TAG" - if [ "$DOCKER_LATEST" = 'yes' ]; then - logmsg "Docker latest tag is ready to be created with command: git tag --force $DOCKER_LATEST_TAG" - fi else case "$TAG" in *rc*) @@ -286,14 +272,6 @@ else esac git tag "$TAG" logmsg "$TAG is created OK." - if [ "$DOCKER_LATEST" = 'yes' ]; then - git tag --force "$DOCKER_LATEST_TAG" - logmsg "$DOCKER_LATEST_TAG is created OK." - fi - logwarn "Don't forget to push the tags!" - if [ "$DOCKER_LATEST" = 'yes' ]; then - echo "git push --atomic --force origin $TAG $DOCKER_LATEST_TAG" - else - echo "git push origin $TAG" - fi + logwarn "Don't forget to push the tag!" + echo "git push origin $TAG" fi From 7852af896cc371f4513130d5148eb54b285c9646 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 11 Aug 2023 11:13:07 +0200 Subject: [PATCH 3/3] chore: e5.2.0-alpha.1 --- apps/emqx/include/emqx_release.hrl | 2 +- deploy/charts/emqx-enterprise/Chart.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index d76c02d78..e0601cc7f 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -35,7 +35,7 @@ -define(EMQX_RELEASE_CE, "5.1.5-build.3"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.1.1"). +-define(EMQX_RELEASE_EE, "5.2.0-alpha.1"). %% The HTTP API version -define(EMQX_API_VERSION, "5.0"). diff --git a/deploy/charts/emqx-enterprise/Chart.yaml b/deploy/charts/emqx-enterprise/Chart.yaml index 626436517..971817e10 100644 --- a/deploy/charts/emqx-enterprise/Chart.yaml +++ b/deploy/charts/emqx-enterprise/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 5.1.1 +version: 5.2.0-alpha.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 5.1.1 +appVersion: 5.2.0-alpha.1