diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 5593a78a..1e3b12f1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - if: contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.draft == false + if: contains(github.event.pull_request.labels.*.name, 'automerge') && !contains(github.event.pull_request.labels.*.name, 'do-not-merge') && github.event.pull_request.draft == false steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 diff --git a/src/automerge.ts b/src/automerge.ts index aec07cca..da2dfbe9 100644 --- a/src/automerge.ts +++ b/src/automerge.ts @@ -33,7 +33,7 @@ export class Automerge { workflow.addJobs({ automerge: { runsOn: ["ubuntu-latest"], - if: "contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.draft == false", + if: "contains(github.event.pull_request.labels.*.name, 'automerge') && !contains(github.event.pull_request.labels.*.name, 'do-not-merge') && github.event.pull_request.draft == false", steps: [ { name: "Checkout",