Quellcode durchsuchen

move dependabot auto-merge to build (#7146)

Joshua Cox vor 3 Jahren
Ursprung
Commit
e875527f17
2 geänderte Dateien mit 15 neuen und 24 gelöschten Zeilen
  1. 15 0
      .github/workflows/build.yml
  2. 0 24
      .github/workflows/dependabot-automerge.yml

+ 15 - 0
.github/workflows/build.yml

@@ -151,3 +151,18 @@ jobs:
           # we'd like to try and do the diffing before github_actions_clean & setup.
           # This will run the tests exactly as you would in your own vm:
           docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS --results-environment Github-Actions;
+  dependabot:
+    needs: verify
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

+ 0 - 24
.github/workflows/dependabot-automerge.yml

@@ -1,24 +0,0 @@
-name: Dependabot auto-merge
-on:
-  workflow_run:
-    workflows: [ "build" ]
-    types:
-      - completed
-permissions:
-  pull-requests: write
-  contents: write
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' && github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/[email protected]
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}