From d629cdeabae36c110a0ddb43226acfeaac7df34b Mon Sep 17 00:00:00 2001 From: Mike Perry Y Attara Date: Tue, 16 Mar 2021 04:13:59 +0000 Subject: [PATCH 1/2] add check for mergeability --- .github/workflows/automerge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index b1faf6401c64..2af542876a46 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -24,11 +24,12 @@ jobs: uses: hmarr/auto-approve-action@7782c7e2bdf62b4d79bdcded8332808fd2f179cd with: github-token: ${{ secrets.GITHUB_TOKEN }} - if: github.event.label.name == 'automerge' && github.actor == 'OSBotify' && steps.changed.outputs.files_updated == 'android/app/build.gradle ios/ExpensifyCash/Info.plist ios/ExpensifyCashTests/Info.plist package-lock.json package.json' && steps.changed.outputs.files_created == '' && steps.changed.outputs.files_deleted == '' + if: github.event.pull_request.mergeable && github.event.label.name == 'automerge' && github.actor == 'OSBotify' && steps.changed.outputs.files_updated == 'android/app/build.gradle ios/ExpensifyCash/Info.plist ios/ExpensifyCashTests/Info.plist package-lock.json package.json' && steps.changed.outputs.files_created == '' && steps.changed.outputs.files_deleted == '' - name: Check for an auto merge # Version: 0.12.0 uses: pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07 + if: github.event.pull_request.mergeable env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e4eff6cf1c054c4b2114804bf6044982c216b161 Mon Sep 17 00:00:00 2001 From: Mike Perry Y Attara Date: Tue, 16 Mar 2021 04:22:46 +0000 Subject: [PATCH 2/2] add check for mergeable state --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 2af542876a46..7eac9e34cc87 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -29,7 +29,7 @@ jobs: - name: Check for an auto merge # Version: 0.12.0 uses: pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07 - if: github.event.pull_request.mergeable + if: github.event.pull_request.mergeable && github.event.pull_request.mergeable_state == 'clean' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}