diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index b05d90708..2f4ea9fc2 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -11,14 +11,17 @@ 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: + needs: autolabel + runs-on: ubuntu-latest + steps: - name: Auto-merge uses: pascalgn/automerge-action@v0.15.6 env: @@ -26,3 +29,5 @@ jobs: MERGE_LABELS: "automerge,!work in progress,!ready for review" MERGE_REMOVE_LABELS: "automerge" LOG: DEBUG + MERGE_RETRIES: 10 + MERGE_RETRY_SLEEP: 60000