diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml index af969e8f7..cece37d08 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-55', '5.3-2:1.15.7-25.3.2-2'] + - ['emqx-enterprise', 'release-56', '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 a51ef0d58..4b3f67309 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -25,6 +25,7 @@ jobs: branch: - master - release-55 + - release-56 language: - cpp - python diff --git a/Makefile b/Makefile index 3bf48b1a4..2cbcc803a 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ endif # Dashboard version # from https://github.com/emqx/emqx-dashboard5 export EMQX_DASHBOARD_VERSION ?= v1.7.0 -export EMQX_EE_DASHBOARD_VERSION ?= e1.5.1-s3 +export EMQX_EE_DASHBOARD_VERSION ?= e1.6.0-beta.1 PROFILE ?= emqx REL_PROFILES := emqx emqx-enterprise diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index b9dd84d09..caba43279 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,7 +32,7 @@ %% `apps/emqx/src/bpapi/README.md' %% Opensource edition --define(EMQX_RELEASE_CE, "5.5.0"). +-define(EMQX_RELEASE_CE, "5.6.0-alpha.1"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.5.0"). +-define(EMQX_RELEASE_EE, "5.6.0-alpha.1"). diff --git a/deploy/charts/emqx-enterprise/Chart.yaml b/deploy/charts/emqx-enterprise/Chart.yaml index b870d1123..64bca06d3 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.5.0 +version: 5.6.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.5.0 +appVersion: 5.6.0-alpha.1 diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index 41f0b37b6..91c47cd74 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.5.0 +version: 5.6.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.5.0 +appVersion: 5.6.0-alpha.1 diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index bb6c04da4..95cd7a1d4 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-55 + release-56 NOTE: this option should be used when --dryrun. --dryrun: Do not actually create the git tag. @@ -122,6 +123,12 @@ rel_branch() { e5.5.*) echo 'release-55' ;; + v5.6.*) + echo 'release-56' + ;; + e5.6.*) + echo 'release-56' + ;; *) logerr "Unsupported version tag $TAG" exit 1 diff --git a/scripts/rel/sync-remotes.sh b/scripts/rel/sync-remotes.sh index eb17995c2..6492c90c0 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-55' 'master' ) +BASE_BRANCHES=( 'release-56' 'release-55' 'master' ) usage() { cat <