diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml index 784454c86..56d5c37f2 100644 --- a/.github/workflows/build_packages_cron.yaml +++ b/.github/workflows/build_packages_cron.yaml @@ -24,7 +24,7 @@ jobs: matrix: profile: - ['emqx', 'master', '5.3-2:1.15.7-26.2.1-2'] - - ['emqx-enterprise', 'release-54', '5.3-2:1.15.7-25.3.2-2'] + - ['emqx-enterprise', 'release-55', '5.3-2:1.15.7-25.3.2-2'] os: - debian10 - ubuntu22.04 diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index fd982d506..a51ef0d58 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -24,7 +24,7 @@ jobs: matrix: branch: - master - - release-54 + - release-55 language: - cpp - python diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 0115edc91..6d9a1c22b 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,10 +32,10 @@ %% `apps/emqx/src/bpapi/README.md' %% Opensource edition --define(EMQX_RELEASE_CE, "5.4.1"). +-define(EMQX_RELEASE_CE, "5.5.0"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.4.1"). +-define(EMQX_RELEASE_EE, "5.5.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 5f4dc4cdc..59d92aa02 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.4.1 +version: 5.5.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.4.1 +appVersion: 5.5.0-alpha.1 diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index c95573c0a..41f0b37b6 100644 --- a/deploy/charts/emqx/Chart.yaml +++ b/deploy/charts/emqx/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.4.1 +version: 5.5.0 # 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.4.1 +appVersion: 5.5.0 diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index e218f8d0b..136f8c466 100755 --- a/scripts/rel/cut.sh +++ b/scripts/rel/cut.sh @@ -20,10 +20,7 @@ options: -h|--help: Print this usage. -b|--base: Specify the current release base branch, can be one of - release-51 - release-52 - release-53 - release-54 + release-55 NOTE: this option should be used when --dryrun. --dryrun: Do not actually create the git tag. @@ -38,7 +35,7 @@ options: For 5.X series the current working branch must be 'release-5X' --.--[ master ]---------------------------.-----------.--- \\ / - \`---[release-54]----(v5.4.0 | e5.4.0) + \`---[release-5X]----(v5.4.0 | e5.4.0) EOF } @@ -119,29 +116,11 @@ done rel_branch() { local tag="$1" case "$tag" in - v5.1.*) - echo 'release-51' + v5.5.*) + echo 'release-55' ;; - e5.1.*) - echo 'release-51' - ;; - v5.2.*) - echo 'release-52' - ;; - e5.2.*) - echo 'release-52' - ;; - v5.3.*) - echo 'release-53' - ;; - e5.3.*) - echo 'release-53' - ;; - v5.4.*) - echo 'release-54' - ;; - e5.4.*) - echo 'release-54' + e5.5.*) + echo 'release-55' ;; *) logerr "Unsupported version tag $TAG" diff --git a/scripts/rel/sync-remotes.sh b/scripts/rel/sync-remotes.sh index 6b41415f0..eb17995c2 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-54' 'release-53' 'release-52' 'release-51' 'master' ) +BASE_BRANCHES=( 'release-55' 'master' ) usage() { cat <