Relax dependabot for DeterminateSystems activity

kachick · Mar 14, 2024 · 734aa16 · 734aa16
1 parent 43e8c52
commit 734aa16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,3 +6,7 @@ updates:
       interval: 'monthly'
     ignore:
       - dependency-name: 'crate-ci/typos'
+    groups:
+      nix-actions:
+        patterns:
+          - 'DeterminateSystems*'
diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml
@@ -17,11 +17,11 @@ jobs:
         id: metadata
         uses: dependabot/[email protected]
       - name: Wait other jobs
-        if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
+        if: ${{ steps.metadata.outputs.update-type != 'version-update:semver-major' }}
         uses: kachick/[email protected]
         timeout-minutes: 10
       - name: Approve and merge
-        if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
+        if: ${{ (steps.metadata.outputs.update-type != 'version-update:semver-major') || contains(steps.metadata.outputs.dependency-names, 'DeterminateSystems') }}
         run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}