From ec5c5e5deab969eb64842797282685cb8a4a46b7 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 28 Sep 2024 02:43:41 -0500 Subject: [PATCH] CI: Remove automerge workflow Unfortunately, it doesn't work for forked repositories --- .github/workflows/automerge.yml | 36 -------------------------------- .github/workflows/test-files.yml | 2 -- .github/workflows/test-linux.yml | 2 -- .github/workflows/test-mac.yml | 2 -- .github/workflows/test-win.yml | 2 -- 5 files changed, 44 deletions(-) delete mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0b7375d8937..00000000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,36 +0,0 @@ -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@v0.16.4" - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_LABELS: "automerge" - MERGE_REMOVE_LABELS: "automerge" - MERGE_METHOD: "squash" - BASE_BRANCHES: "6.x" - MERGE_RETRIES: "12" - MERGE_RETRY_SLEEP: "300000" diff --git a/.github/workflows/test-files.yml b/.github/workflows/test-files.yml index 9b5bbf36270..7fb41afdccc 100644 --- a/.github/workflows/test-files.yml +++ b/.github/workflows/test-files.yml @@ -17,7 +17,6 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' - - '!.github/workflows/automerge.yml' pull_request: branches: @@ -35,7 +34,6 @@ 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 5351db5b2df..17fbf99e2c6 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -17,7 +17,6 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' - - '!.github/workflows/automerge.yml' pull_request: branches: @@ -35,7 +34,6 @@ 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 81c1a1d66ea..ff283d444ed 100644 --- a/.github/workflows/test-mac.yml +++ b/.github/workflows/test-mac.yml @@ -17,7 +17,6 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' - - '!.github/workflows/automerge.yml' pull_request: branches: @@ -35,7 +34,6 @@ 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 d5f73845012..a6f74c8fb57 100644 --- a/.github/workflows/test-win.yml +++ b/.github/workflows/test-win.yml @@ -17,7 +17,6 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' - - '!.github/workflows/automerge.yml' pull_request: branches: @@ -35,7 +34,6 @@ on: - '!installers-conda/**' - '!.github/workflows/installers-conda.yml' - '!.github/workflows/build-subrepos.yml' - - '!.github/workflows/automerge.yml' workflow_dispatch: inputs: