diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 63a0ed0f..231611f2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,25 +5,25 @@ # https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file version: 2 + +multi-ecosystem-groups: + dependencies: + schedule: + interval: 'monthly' + updates: - - package-ecosystem: npm + - package-ecosystem: 'npm' directory: '/' - schedule: - interval: monthly + patterns: + - '*' + multi-ecosystem-group: 'dependencies' cooldown: default-days: 7 - groups: - npm-dependencies: - patterns: - - '*' - - package-ecosystem: github-actions + - package-ecosystem: 'github-actions' directory: '/' - schedule: - interval: monthly + patterns: + - '*' + multi-ecosystem-group: 'dependencies' cooldown: default-days: 7 - groups: - github-actions: - patterns: - - '*' diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 77057e1b..d87ae94b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -61,13 +61,7 @@ jobs: github-token: '${{ secrets.GITHUB_TOKEN }}' - name: Enable auto-merge for Dependabot PRs - if: >- - steps.metadata.outputs.update-type == - 'version-update:semver-patch' || - steps.metadata.outputs.update-type == - 'version-update:semver-minor' || - steps.metadata.outputs.update-type == - 'null' + if: steps.metadata.outputs.update-type != 'version-update:semver-major' run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}}