From bcecb691fac18d50fd811f512afb5cca2ba638fb Mon Sep 17 00:00:00 2001 From: hyang Date: Thu, 1 Aug 2024 20:22:01 +0800 Subject: [PATCH] Update merge branch action to be call by repository dispatch --- .github/workflows/merge_branch.yaml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/merge_branch.yaml b/.github/workflows/merge_branch.yaml index d1a84ba..cf31ad2 100644 --- a/.github/workflows/merge_branch.yaml +++ b/.github/workflows/merge_branch.yaml @@ -1,22 +1,16 @@ name: Merge branch on: - workflow_dispatch: - inputs: - source_branch: - description: "Merge branch from" - default: "master" - target_branch: - description: "Merge branch to" - default: "master" + repository_dispatch: + types: curl_request_merge jobs: sync-branch: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Merge branch ${{ github.event.inputs.source_branch }} -> ${{ github.event.inputs.target_branch }} + - name: Merge branch ${{ github.event.client_payload.source_branch }} -> ${{ github.event.client_payload.target_branch }} uses: everlytic/branch-merge@1.1.2 with: - source_ref: ${{ github.event.inputs.source_branch }} - target_branch: ${{ github.event.inputs.target_branch }} + source_ref: ${{ github.event.client_payload.source_branch }} + target_branch: ${{ github.event.client_payload.target_branch }} github_token: ${{ github.token }} - commit_message_template: '[Automated] Merged {source_ref} into target {target_branch}' + commit_message_template: '[Automated] Merged {source_ref} into target {target_branch}' \ No newline at end of file