From 2d22650e86593946a0cfc8f8540115ac6aaca7fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sumire=20=28=E8=8F=AB=29?= <151038614+sumire88@users.noreply.github.com> Date: Sat, 24 Aug 2024 09:13:55 -0400 Subject: [PATCH] ci/fix(sync-changes-to-child-branches): update cherry-pick-branch name (#57) * 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 --- .github/workflows/automerge-sync-pr.yml | 6 ++++-- .github/workflows/sync-changes-to-child-branches.yml | 2 +- .github/workflows/sync-changes-to-release-branch.yml | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automerge-sync-pr.yml b/.github/workflows/automerge-sync-pr.yml index 3b9c67f..1c8b159 100644 --- 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 index 5afcf5e..b2f5979 100644 --- 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 index a66151b..8264538 100644 --- 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 ]