diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b0c4503..fcf1dfa 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,8 +17,8 @@ updates: - dependabot ignore: - dependency-name: eslint - update-types: - - version-update:semver-major + versions: + - ">=10" groups: npm-production: dependency-type: production diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 88a0dc8..ed92d1d 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -21,6 +21,7 @@ jobs: uses: dependabot/fetch-metadata@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} + skip-commit-verification: true - name: Enable auto-merge after checks pass if: | @@ -30,4 +31,4 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_URL: ${{ github.event.pull_request.html_url }} - run: gh pr merge "$PR_URL" --auto --squash + run: gh pr merge "$PR_URL" --auto --merge