ci: prepare for 5.1 release

This commit is contained in:
Zaiming (Stone) Shi 2023-05-30 08:03:42 +02:00
parent 747eb6fcff
commit 5aaac86e28
5 changed files with 18 additions and 18 deletions

View File

@ -1,6 +1,6 @@
Fixes <issue-or-jira-number> Fixes <issue-or-jira-number>
<!-- Make sure to target release-50 branch if this PR is intended to fix the issues for the release candidate. --> <!-- Make sure to target release-51 branch if this PR is intended to fix the issues for the release candidate. -->
## Summary ## Summary
copilot:summary copilot:summary

View File

@ -23,7 +23,7 @@ jobs:
matrix: matrix:
profile: profile:
- ['emqx', 'master'] - ['emqx', 'master']
- ['emqx-enterprise', 'release-50'] - ['emqx-enterprise', 'release-51']
otp: otp:
- 24.3.4.2-3 - 24.3.4.2-3
arch: arch:

View File

@ -8,7 +8,7 @@ on:
push: push:
branches: branches:
- master - master
- release-50 - release-51
pull_request: pull_request:
# GitHub pull_request action is by default triggered when # GitHub pull_request action is by default triggered when
# opened reopened or synchronize, # opened reopened or synchronize,

View File

@ -13,14 +13,14 @@ usage() {
cat <<EOF cat <<EOF
$0 RELEASE_GIT_TAG [option] $0 RELEASE_GIT_TAG [option]
RELEASE_GIT_TAG is a 'v*' or 'e*' tag for example: RELEASE_GIT_TAG is a 'v*' or 'e*' tag for example:
v5.0.12 v5.1.1
e5.0.0-beta.6 e5.1.0-beta.6
options: 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-50 release-51
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.
@ -35,10 +35,10 @@ options:
in addition to regular :<version> one in addition to regular :<version> one
NOTE: For 5.0 series the current working branch must be 'release-50' NOTE: For 5.1 series the current working branch must be 'release-51'
--.--[ master ]---------------------------.-----------.--- --.--[ master ]---------------------------.-----------.---
\\ / \\ /
\`---[release-50]----(v5.0.20 | e5.0.1) \`---[release-51]----(v5.1.1 | e5.1.1)
EOF EOF
} }
@ -127,11 +127,11 @@ done
rel_branch() { rel_branch() {
local tag="$1" local tag="$1"
case "$tag" in case "$tag" in
v5.0.*) v5.1.*)
echo 'release-50' echo 'release-51'
;; ;;
e5.0.*) e5.1.*)
echo 'release-50' echo 'release-51'
;; ;;
*) *)
logerr "Unsupported version tag $TAG" logerr "Unsupported version tag $TAG"
@ -270,7 +270,7 @@ else
*beta*) *beta*)
true true
;; ;;
e5.0.0*) e5.1.0*)
# the first release has no change log # the first release has no change log
true true
;; ;;

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-50' 'master' ) BASE_BRANCHES=( 'release-51' 'master' )
usage() { usage() {
cat <<EOF cat <<EOF
@ -18,8 +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-50: [] # no upstream for 5.0 opensource edition * release-51: [] # no upstream for 5.0 opensource edition
* master: [release-50] # sync release-50 to master * master: [release-51] # sync release-51 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
@ -151,11 +151,11 @@ remote_refs() {
upstream_branches() { upstream_branches() {
local base="$1" local base="$1"
case "$base" in case "$base" in
release-50) release-51)
remote_ref "$base" remote_ref "$base"
;; ;;
master) master)
remote_refs "$base" 'release-50' remote_refs "$base" 'release-51'
;; ;;
esac esac
} }