diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 00000000000..be8935abdc3 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,34 @@ +name: Automerge + +on: + pull_request: + types: + - labeled + - unlabeled + - synchronize + - opened + - edited + - ready_for_review + - reopened + - unlocked + check_suite: + types: + - completed + status: {} + +jobs: + automerge: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + steps: + - id: automerge + name: Automerge + uses: "pascalgn/automerge-action" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_LABELS: "automerge" + MERGE_REMOVE_LABELS: "automerge" + MERGE_METHOD: "squash" + BASE_BRANCHES: "6.x" diff --git a/.github/workflows/test-files.yml b/.github/workflows/test-files.yml index 7fb41afdccc..9b5bbf36270 100644 --- a/.github/workflows/test-files.yml +++ b/.github/workflows/test-files.yml @@ -17,6 +17,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' pull_request: branches: @@ -34,6 +35,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' workflow_dispatch: diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 17fbf99e2c6..5351db5b2df 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -17,6 +17,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' pull_request: branches: @@ -34,6 +35,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' workflow_dispatch: inputs: diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml index ff283d444ed..81c1a1d66ea 100644 --- a/.github/workflows/test-mac.yml +++ b/.github/workflows/test-mac.yml @@ -17,6 +17,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' pull_request: branches: @@ -34,6 +35,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' workflow_dispatch: inputs: diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml index a6f74c8fb57..d5f73845012 100644 --- a/.github/workflows/test-win.yml +++ b/.github/workflows/test-win.yml @@ -17,6 +17,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' pull_request: branches: @@ -34,6 +35,7 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' + - '!.github/workflows/automerge.yml' workflow_dispatch: inputs: