Merge pull request #521 from denis-tingaikin/fix-issue-475-part2

use merge-me-action with retries instead of automerge-action
networkservicemesh · Mar 15, 2021 · af5f836 · af5f836
2 parents 448adf7 + aad4bdf
commit af5f836
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -37,9 +37,10 @@ jobs:
         run: |
           find . -type f ! -name '*.yaml' ! -name '*.yml' -exec git diff --exit-code origin/main -- {} +
       - name: Automerge nsmbot PR
-        uses: "pascalgn/automerge-action@v0.13.1"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        uses: ridedott/merge-me-action@master
+        with:
+          MAXIMUM_RETRIES: 10
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   update-dependent-repositories:
     strategy:
       matrix: