Merge pull request #2896 from dbt-labs/joellabes-patch-1

dbt-labs · Dec 14, 2023 · 7234df3 · 7234df3
2 parents d7220ed + a0c7660
commit 7234df3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -11,18 +11,23 @@ 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/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.AUTOMERGE_PAT }}
           MERGE_LABELS: "automerge,!work in progress,!ready for review"
           MERGE_REMOVE_LABELS: "automerge"
           LOG: DEBUG
+          MERGE_RETRIES: 10
+          MERGE_RETRY_SLEEP: 60000