Merge pull request #12622 from id/0301-update-scritps-for-5.6.x

chore: update scripts and workflows for 5.6.x
This commit is contained in:
Ivan Dyachkov 2024-03-04 07:58:44 +01:00 committed by GitHub
commit 30037bb401
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 22 additions and 10 deletions

View File

@ -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

View File

@ -25,6 +25,7 @@ jobs:
branch:
- master
- release-55
- release-56
language:
- cpp
- python

View File

@ -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").

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <<EOF
@ -19,7 +19,8 @@ options:
upstreams branches for the current working branch.
The uppstream branch of the current branch are as below:
* release-55: [] # no upstream for 5.5 opensource edition
* master: [release-55] # sync release-55 to master
* release-56: [] # no upstream for 5.6 opensource edition
* master: [release-5x] # sync release-5x to master
-b|--base:
The base branch of current working branch if currently is not
@ -154,8 +155,11 @@ upstream_branches() {
release-55)
remote_ref "$base"
;;
release-56)
remote_ref "$base"
;;
master)
remote_refs "$base" 'release-55'
remote_refs "$base" 'release-55' 'release-56'
;;
esac
}