Cherry-pick #5079 #5080 #5081 #5083 #5085 (#5094)

* Add workflow for patch release (#5079) Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: t-kikuc <[email protected]> * Add user info for cherry-pick (#5080) Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: t-kikuc <[email protected]> * Add quiet option for cherry-pick (#5081) Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: t-kikuc <[email protected]> * Add sign off option for git cherry-pick (#5083) Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: t-kikuc <[email protected]> * add ci rule for release branch (#5085) Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: t-kikuc <[email protected]> --------- Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: t-kikuc <[email protected]> Co-authored-by: Yoshiki Fujikane <[email protected]>
pipe-cd · Jul 29, 2024 · 6875c92 · 6875c92
1 parent be5d908
commit 6875c92
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 1 deletion.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
 
 env:
   GO_VERSION: 1.22.4

diff --git a/.github/workflows/build_tool.yaml b/.github/workflows/build_tool.yaml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
     paths:
       - tool/**
 

diff --git a/.github/workflows/cherry_pick.yaml b/.github/workflows/cherry_pick.yaml
@@ -0,0 +1,25 @@
+name: cherry_pick
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseBranch:
+        description: 'release branch (e.g. release-v0.48.x)'
+        required: true
+        type: string
+      version:
+        description: 'release version (e.g. v0.48.1)'
+        required: true
+        type: string
+jobs:
+  tool:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: make a cherry-pick PR
+        run: |
+          git config user.name "pipecd-bot"
+          git config user.email "[email protected]"
+          ./hack/cherry-pick.sh -q ${{ inputs.releaseBranch }} $(gh pr list --label cherry-pick --label ${{ inputs.version }} --state merged | awk '{print $1}' | sort | paste -sd ' ' -)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
 
 env:
   GO_VERSION: 1.22.4

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
 
 env:
   GO_VERSION: 1.22.4

diff --git a/.github/workflows/test_tool.yaml b/.github/workflows/test_tool.yaml
@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
     paths:
       - tool/**
 

diff --git a/hack/cherry-pick.sh b/hack/cherry-pick.sh
@@ -76,7 +76,7 @@ echo
 # Cherry-pick pull requests
 COMMITS=$(join " " "${COMMIT_HASHS[@]}")
 echo "+++ Cherry-picking pull requests"
-git cherry-pick ${COMMITS}
+git cherry-pick -s ${COMMITS}
 echo
 
 # Check whether to push commits and create a pull request or not