From 7bdefd065fc2ee031f2800ec386546476bf3ad3c Mon Sep 17 00:00:00 2001
From: Ivan Dyachkov <dev@dyachkov.org>
Date: Fri, 11 Aug 2023 11:11:58 +0200
Subject: [PATCH] chore: update scripts, workflows and documentation to support
 release-52

---
 .github/pull_request_template.md           |  2 +-
 .github/workflows/_push-entrypoint.yaml    |  1 +
 .github/workflows/build_packages_cron.yaml |  1 +
 scripts/rel/cut.sh                         | 14 +++++++++++++-
 scripts/rel/sync-remotes.sh                | 12 ++++++++----
 scripts/shelltest/parse-git-ref.test       |  5 +++++
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d75661a8a..0c4fe2765 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 Fixes <issue-or-jira-number>
 
-<!-- Make sure to target release-51 branch if this PR is intended to fix the issues for the release candidate. -->
+<!-- Make sure to target release-52 branch if this PR is intended to fix the issues for the release candidate. -->
 
 ## Summary
 copilot:summary
diff --git a/.github/workflows/_push-entrypoint.yaml b/.github/workflows/_push-entrypoint.yaml
index 32f3ae15a..9ef517ab9 100644
--- a/.github/workflows/_push-entrypoint.yaml
+++ b/.github/workflows/_push-entrypoint.yaml
@@ -12,6 +12,7 @@ on:
     branches:
       - 'master'
       - 'release-51'
+      - 'release-52'
       - 'ci/**'
 
 env:
diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml
index b245078da..f9a0c70a1 100644
--- a/.github/workflows/build_packages_cron.yaml
+++ b/.github/workflows/build_packages_cron.yaml
@@ -24,6 +24,7 @@ jobs:
         profile:
           - ['emqx', 'master']
           - ['emqx-enterprise', 'release-51']
+          - ['emqx-enterprise', 'release-52']
         otp:
           - 25.3.2-1
         arch:
diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh
index b44acd03f..7e0c25409 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-51
+                     release-52
                      NOTE: this option should be used when --dryrun.
 
   --dryrun:          Do not actually create the git tag.
@@ -35,10 +36,15 @@ options:
                      in addition to regular :<version> one
 
 
-NOTE: For 5.1 series the current working branch must be 'release-51'
+For 5.1 series the current working branch must be 'release-51'
       --.--[  master  ]---------------------------.-----------.---
          \\                                      /
           \`---[release-51]----(v5.1.1 | e5.1.1)
+
+For 5.2 series the current working branch must be 'release-52'
+      --.--[  master  ]---------------------------.-----------.---
+         \\                                      /
+          \`---[release-52]----(v5.2.1 | e5.2.1)
 EOF
 }
 
@@ -133,6 +139,12 @@ rel_branch() {
         e5.1.*)
             echo 'release-51'
             ;;
+        v5.2.*)
+            echo 'release-52'
+            ;;
+        e5.2.*)
+            echo 'release-52'
+            ;;
         *)
             logerr "Unsupported version tag $TAG"
             exit 1
diff --git a/scripts/rel/sync-remotes.sh b/scripts/rel/sync-remotes.sh
index f4cbadfa1..dddc10638 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-51' 'master' )
+BASE_BRANCHES=( 'release-52' 'release-51' 'master' )
 
 usage() {
     cat <<EOF
@@ -18,8 +18,9 @@ options:
     It tries to merge (by default with --ff-only option)
     upstreams branches for the current working branch.
     The uppstream branch of the current branch are as below:
-    * release-51: []        # no upstream for 5.0 opensource edition
-    * master: [release-51]  # sync release-51 to master
+    * release-52: []        # no upstream for 5.2 opensource edition
+    * release-51: []        # no upstream for 5.1 opensource edition
+    * master: [release-52]  # sync release-52 to master
 
   -b|--base:
     The base branch of current working branch if currently is not
@@ -151,11 +152,14 @@ remote_refs() {
 upstream_branches() {
     local base="$1"
     case "$base" in
+        release-52)
+            remote_ref "$base"
+            ;;
         release-51)
             remote_ref "$base"
             ;;
         master)
-            remote_refs "$base" 'release-51'
+            remote_refs "$base" 'release-52'
             ;;
     esac
 }
diff --git a/scripts/shelltest/parse-git-ref.test b/scripts/shelltest/parse-git-ref.test
index 37bc9a560..35a8efac1 100644
--- a/scripts/shelltest/parse-git-ref.test
+++ b/scripts/shelltest/parse-git-ref.test
@@ -93,6 +93,11 @@ Unrecognized tag: refs/tags/v5.2.0-alpha-1
 {"profile": "emqx-enterprise", "release": false, "latest": false}
 >>>= 0
 
+./parse-git-ref.sh refs/heads/release-52
+>>>
+{"profile": "emqx-enterprise", "release": false, "latest": false}
+>>>= 0
+
 ./parse-git-ref.sh refs/heads/ci/foobar
 >>>
 {"profile": "emqx", "release": false, "latest": false}