From bb9fcf5bc7a012fe8eb8f6946313a26f2e61b732 Mon Sep 17 00:00:00 2001 From: Joel Labes Date: Thu, 14 Dec 2023 15:47:25 +1300 Subject: [PATCH 1/4] Update auto-merge.yml --- .github/workflows/auto-merge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index b05d90708..01add8ac7 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -26,3 +26,5 @@ jobs: MERGE_LABELS: "automerge,!work in progress,!ready for review" MERGE_REMOVE_LABELS: "automerge" LOG: DEBUG + MERGE_RETRIES: 10 + MERGE_RETRY_SLEEP: 60000 From 622dbdbbcd879b860534bce8458fdb8ffdf8732b Mon Sep 17 00:00:00 2001 From: Joel Labes Date: Thu, 14 Dec 2023 15:55:43 +1300 Subject: [PATCH 2/4] Update auto-merge.yml --- .github/workflows/auto-merge.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 01add8ac7..a8ebfe01b 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -11,14 +11,16 @@ permissions: write-all jobs: - automerge: + autolabel: runs-on: ubuntu-latest steps: - name: Auto-label uses: actions/labeler@v4 with: repo-token: ${{ secrets.AUTOMERGE_PAT }} - + automerge: + runs-on: ubuntu-latest + steps: - name: Auto-merge uses: pascalgn/automerge-action@v0.15.6 env: From 2f490216b50b910f536bdd1dbcf8d4414882e2db Mon Sep 17 00:00:00 2001 From: Joel Labes Date: Thu, 14 Dec 2023 15:59:07 +1300 Subject: [PATCH 3/4] Update auto-merge.yml --- .github/workflows/auto-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index a8ebfe01b..dc922afed 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -23,6 +23,7 @@ jobs: steps: - name: Auto-merge uses: pascalgn/automerge-action@v0.15.6 + needs: autolabel env: GITHUB_TOKEN: ${{ secrets.AUTOMERGE_PAT }} MERGE_LABELS: "automerge,!work in progress,!ready for review" From a0c7660af8d1194fb717d91b84cf907bad7010c7 Mon Sep 17 00:00:00 2001 From: Joel Labes Date: Thu, 14 Dec 2023 16:00:49 +1300 Subject: [PATCH 4/4] Update auto-merge.yml --- .github/workflows/auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index dc922afed..2f4ea9fc2 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -19,11 +19,11 @@ jobs: with: repo-token: ${{ secrets.AUTOMERGE_PAT }} automerge: + needs: autolabel runs-on: ubuntu-latest steps: - name: Auto-merge uses: pascalgn/automerge-action@v0.15.6 - needs: autolabel env: GITHUB_TOKEN: ${{ secrets.AUTOMERGE_PAT }} MERGE_LABELS: "automerge,!work in progress,!ready for review"