ci/fix(sync-changes-to-child-branches): update cherry-pick-branch name (

#57) (#60) * ci(sync-changes-to-child-branches): update cherry-pick-branch name * ci(automerge-sync-pr): fix trigger * ci(sync-changes-to-{child,release}-branch{es}}: demise workflow_dispatch trigger Co-authored-by: Sumire (菫) <[email protected]>
daeuniverse · Aug 24, 2024 · 17c28a2 · 17c28a2
1 parent 536787c
commit 17c28a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/automerge-sync-pr.yml b/.github/workflows/automerge-sync-pr.yml
@@ -14,8 +14,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - branch: release
-            labels: branch/release
+          - branch: unstable
+            labels: branch/unstable
+          - branch: experiment
+            labels: branch/experiment
       fail-fast: false
     steps:
       - name: Generate GitHub Auth Token

diff --git a/.github/workflows/sync-changes-to-child-branches.yml b/.github/workflows/sync-changes-to-child-branches.yml
@@ -1,7 +1,6 @@
 name: Sync changes to remote child branches
 
 on:
-  workflow_dispatch:
   pull_request:
     branches: [ main ]
     types: [ closed ]
@@ -54,5 +53,6 @@ jobs:
           team-reviewers: ${{ env.PR_TEAM_REVIEWERS }}
           title: '[cherry-pick] {old_title}'
           body: 'ci: cherry picking #{old_pull_request_id} onto ${{ matrix.branch }}'
+          cherry-pick-branch: cherry-pick-${inputs.branch}-${commitSha}-${{ github.run_id }}
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
diff --git a/.github/workflows/sync-changes-to-release-branch.yml b/.github/workflows/sync-changes-to-release-branch.yml
@@ -1,7 +1,6 @@
 name: Sync changes to remote release branch
 
 on:
-  workflow_dispatch:
   pull_request:
     branches: [ main ]
     types: [ closed ]