From 7aac98726517e66065a1ecacb7303631953fd9d9 Mon Sep 17 00:00:00 2001 From: Cai Chen Date: Thu, 8 Aug 2024 15:41:34 -0400 Subject: [PATCH] Sync from server repo (2eb051e5a03) --- .github/workflows/merge_branch.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/merge_branch.yaml diff --git a/.github/workflows/merge_branch.yaml b/.github/workflows/merge_branch.yaml new file mode 100644 index 0000000..721f717 --- /dev/null +++ b/.github/workflows/merge_branch.yaml @@ -0,0 +1,20 @@ +name: Merge branch +on: + repository_dispatch: + types: curl_request_merge +jobs: + unit-test: + uses: ./.github/workflows/unittests.yaml + + sync-branch: + needs: [unit-test] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - 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.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}' \ No newline at end of file