Merge pull request #357 from viperproject/switch-from-bors-to-merge-q…

…ueues Use merge queues for updating submodules
viperproject · Dec 5, 2023 · 7c0003c · 7c0003c
2 parents 55ecea9 + ec52c14
commit 7c0003c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
@@ -51,9 +51,6 @@ jobs:
             * Updates Gobra from `${{ env.PREV_GOBRA_REF }}` to `${{ env.CUR_GOBRA_REF }}`.
 
       - name: Enable auto-merge of PR
-        uses: peter-evans/create-or-update-comment@v2
-        if: env.PREV_GOBRA_REF != env.CUR_GOBRA_REF
-        with:
-          token: ${{ secrets.VIPER_ADMIN_TOKEN }}
-          issue-number: ${{ steps.pr.outputs.pull-request-number }}
-          body: bors merge
+        run: gh pr merge --merge --auto "${{ steps.pr.outputs.pull-request-number }}"
+        env:
+          GH_TOKEN: ${{ secrets.VIPER_ADMIN_TOKEN }}
diff --git a/bors.toml b/bors.toml