Backport to branch(3.7) : Should not create PR for base branch in Aut…

…o-PR (#1258) Co-authored-by: Toshihiro Suzuki <[email protected]>
scalar-labs · Nov 2, 2023 · 55cef87 · 55cef87
1 parent 9d954d5
commit 55cef87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/auto-pr.yaml b/.github/workflows/auto-pr.yaml
@@ -46,6 +46,8 @@ jobs:
           echo -------------
 
           branches=$(ci/auto-pr/conv_proj_version_to_branch $versions)
+          # Remove the base branch from the list because the target change is already merged to the branch.
+          branches=$(echo "$branches" | sed "/^${{ github.base_ref }}$/d")
           echo -------------
           echo "branches: $branches"
           echo -------------

diff --git a/ci/auto-pr/conv_proj_version_to_branch b/ci/auto-pr/conv_proj_version_to_branch
@@ -12,8 +12,7 @@ versions.inject(Set.new) {|acc, v|
       # e.g. project: "ScalarDB 4.0.0" -> branch: "master"
       #
       # This GitHub project corresponds to `main`/`master` branch.
-      # The target change is already merged to the default branch.
-      # Nonthing to do.
+      acc << "master"
     else
       # e.g. project: "ScalarDB 3.8.0" -> branch: "3"
       #