chore: update scripts and ci from old release-xx branch to release-55
This commit is contained in:
parent
61417f26d4
commit
34681ec7a2
|
@ -24,7 +24,7 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
profile:
|
profile:
|
||||||
- ['emqx', 'master', '5.3-2:1.15.7-26.2.1-2']
|
- ['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:
|
os:
|
||||||
- debian10
|
- debian10
|
||||||
- ubuntu22.04
|
- ubuntu22.04
|
||||||
|
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
branch:
|
branch:
|
||||||
- master
|
- master
|
||||||
- release-54
|
- release-55
|
||||||
language:
|
language:
|
||||||
- cpp
|
- cpp
|
||||||
- python
|
- python
|
||||||
|
|
|
@ -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.5.1-alpha.1
|
version: 5.5.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.5.1-alpha.1
|
appVersion: 5.5.0-alpha.1
|
||||||
|
|
|
@ -20,10 +20,7 @@ options:
|
||||||
-h|--help: Print this usage.
|
-h|--help: Print this usage.
|
||||||
|
|
||||||
-b|--base: Specify the current release base branch, can be one of
|
-b|--base: Specify the current release base branch, can be one of
|
||||||
release-51
|
release-55
|
||||||
release-52
|
|
||||||
release-53
|
|
||||||
release-54
|
|
||||||
NOTE: this option should be used when --dryrun.
|
NOTE: this option should be used when --dryrun.
|
||||||
|
|
||||||
--dryrun: Do not actually create the git tag.
|
--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'
|
For 5.X series the current working branch must be 'release-5X'
|
||||||
--.--[ master ]---------------------------.-----------.---
|
--.--[ master ]---------------------------.-----------.---
|
||||||
\\ /
|
\\ /
|
||||||
\`---[release-54]----(v5.4.0 | e5.4.0)
|
\`---[release-5X]----(v5.4.0 | e5.4.0)
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -119,29 +116,11 @@ done
|
||||||
rel_branch() {
|
rel_branch() {
|
||||||
local tag="$1"
|
local tag="$1"
|
||||||
case "$tag" in
|
case "$tag" in
|
||||||
v5.1.*)
|
v5.5.*)
|
||||||
echo 'release-51'
|
echo 'release-55'
|
||||||
;;
|
;;
|
||||||
e5.1.*)
|
e5.5.*)
|
||||||
echo 'release-51'
|
echo 'release-55'
|
||||||
;;
|
|
||||||
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'
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
logerr "Unsupported version tag $TAG"
|
logerr "Unsupported version tag $TAG"
|
||||||
|
|
|
@ -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-54' 'release-53' 'release-52' 'release-51' 'master' )
|
BASE_BRANCHES=( 'release-55' 'master' )
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
@ -18,11 +18,8 @@ options:
|
||||||
It tries to merge (by default with --ff-only option)
|
It tries to merge (by default with --ff-only option)
|
||||||
upstreams branches for the current working branch.
|
upstreams branches for the current working branch.
|
||||||
The uppstream branch of the current branch are as below:
|
The uppstream branch of the current branch are as below:
|
||||||
* release-54: [] # no upstream for 5.4 opensource edition
|
* release-55: [] # no upstream for 5.5 opensource edition
|
||||||
* release-53: [] # no upstream for 5.3 opensource edition
|
* master: [release-55] # sync release-55 to master
|
||||||
* release-52: [] # no upstream for 5.2 opensource edition
|
|
||||||
* release-51: [] # no upstream for 5.1 opensource edition
|
|
||||||
* master: [release-54] # sync release-54 to master
|
|
||||||
|
|
||||||
-b|--base:
|
-b|--base:
|
||||||
The base branch of current working branch if currently is not
|
The base branch of current working branch if currently is not
|
||||||
|
@ -154,20 +151,11 @@ remote_refs() {
|
||||||
upstream_branches() {
|
upstream_branches() {
|
||||||
local base="$1"
|
local base="$1"
|
||||||
case "$base" in
|
case "$base" in
|
||||||
release-54)
|
release-55)
|
||||||
remote_ref "$base"
|
|
||||||
;;
|
|
||||||
release-53)
|
|
||||||
remote_ref "$base"
|
|
||||||
;;
|
|
||||||
release-52)
|
|
||||||
remote_ref "$base"
|
|
||||||
;;
|
|
||||||
release-51)
|
|
||||||
remote_ref "$base"
|
remote_ref "$base"
|
||||||
;;
|
;;
|
||||||
master)
|
master)
|
||||||
remote_refs "$base" 'release-54'
|
remote_refs "$base" 'release-55'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue