yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13572 from id/20240805-prep-5.8.0-alpha.1 

chore: prepare 5.8.0-alpha.1
This commit is contained in:
Ivan Dyachkov 2024-08-05 16:05:42 +02:00 committed by GitHub
parent 4865999606 4cf7151139
commit d6651a1889
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build_packages_cron.yaml vendored
View File

@ -23,6 +23,7 @@ jobs:
profile: profile:
- ['emqx', 'master'] - ['emqx', 'master']
- ['emqx', 'release-57'] - ['emqx', 'release-57']
- ['emqx', 'release-58']
os: os:
- ubuntu22.04 - ubuntu22.04
- amzn2023 - amzn2023

1
.github/workflows/codeql.yaml vendored
View File

@ -24,6 +24,7 @@ jobs:
branch: branch:
- master - master
- release-57 - release-57
- release-58
language: language:
- cpp - cpp
- python - python

1
.github/workflows/green_master.yaml vendored
View File

@ -24,6 +24,7 @@ jobs:
ref: ref:
- master - master
- release-57 - release-57
- release-58
steps: steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with: with:

4
apps/emqx/include/emqx_release.hrl
View File

@ -32,7 +32,7 @@
%% `apps/emqx/src/bpapi/README.md' %% `apps/emqx/src/bpapi/README.md'
%% Opensource edition %% Opensource edition
-define(EMQX_RELEASE_CE, "5.7.1"). -define(EMQX_RELEASE_CE, "5.8.0-alpha.1").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.7.1"). -define(EMQX_RELEASE_EE, "5.8.0-alpha.1").

4
deploy/charts/emqx-enterprise/Chart.yaml
View File

@ -14,8 +14,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
version: 5.7.1 version: 5.8.0-alpha.1
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 5.7.1 appVersion: 5.8.0-alpha.1

4
deploy/charts/emqx/Chart.yaml
View File

@ -14,8 +14,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
version: 5.7.1 version: 5.8.0-alpha.1
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 5.7.1 appVersion: 5.8.0-alpha.1

6
scripts/rel/cut.sh
View File

@ -135,6 +135,12 @@ rel_branch() {
e5.7.*) e5.7.*)
echo 'release-57' echo 'release-57'
;; ;;
v5.8.*)
echo 'release-58'
;;
e5.8.*)
echo 'release-58'
;;
*) *)
logerr "Unsupported version tag $TAG" logerr "Unsupported version tag $TAG"
exit 1 exit 1

8
scripts/rel/sync-remotes.sh
View File

@ -5,7 +5,7 @@ set -euo pipefail
# ensure dir # ensure dir
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
BASE_BRANCHES=( 'release-57' 'release-56' 'release-55' 'master' ) BASE_BRANCHES=( 'release-58' 'release-57' 'release-56' 'release-55' 'master' )
usage() { usage() {
cat <<EOF cat <<EOF
@ -21,6 +21,7 @@ options:
* release-55: [] # no upstream for 5.5 opensource edition * release-55: [] # no upstream for 5.5 opensource edition
* release-56: [] # no upstream for 5.6 opensource edition * release-56: [] # no upstream for 5.6 opensource edition
* release-57: [] # no upstream for 5.7 opensource edition * release-57: [] # no upstream for 5.7 opensource edition
* release-58: [] # no upstream for 5.8 opensource edition
* master: [release-5x] # sync release-5x to master * master: [release-5x] # sync release-5x to master
-b|--base: -b|--base:
@ -162,8 +163,11 @@ upstream_branches() {
release-57) release-57)
remote_ref "$base" remote_ref "$base"
;; ;;
release-58)
remote_ref "$base"
;;
master) master)
remote_refs "$base" 'release-55' 'release-56' 'release-57' remote_refs "$base" 'release-55' 'release-56' 'release-57' 'release-58'
;; ;;
esac esac
} }