fix merge method

grafana · Sep 6, 2024 · 0d6a197 · 0d6a197
1 parent 7fb1df5
commit 0d6a197
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/.github/workflows/automatic-update.yml b/.github/workflows/automatic-update.yml
@@ -52,17 +52,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Enable auto-merge for PR
-        run: gh pr merge --auto --rebase "$PR_URL"
+        run: gh pr merge --auto "$PR_URL"
         env:
           PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-  alls-green:
-    if: always()
-    needs:
-      - update-grafana
-    runs-on: ubuntu-latest
-    steps:
-      - name: Ensure all other jobs pass successfully
-        uses: re-actors/alls-green@release/v1
-        with:
-          jobs: ${{ toJSON(needs) }}