diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 80b2916..90aedb8 100644 --- 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 index 15a95d0..042dde9 100644 --- a/.github/workflows/merge-bot-pr.yml +++ b/.github/workflows/merge-bot-pr.yml @@ -17,11 +17,11 @@ jobs: id: metadata uses: dependabot/fetch-metadata@v1.6.0 - 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/wait-other-jobs@v2.0.3 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}}