diff --git a/.github/workflows/auto-merge-deps.yml b/.github/workflows/auto-merge-deps.yml index e48a8f7..d9e7163 100644 --- a/.github/workflows/auto-merge-deps.yml +++ b/.github/workflows/auto-merge-deps.yml @@ -1,14 +1,28 @@ -name: auto-merge +name: auto-merge dependencies and pre-commit updates +on: pull_request_target -on: - pull_request: +permissions: + contents: write + pull-requests: write jobs: auto-merge: runs-on: ubuntu-latest + if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]' }} + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} steps: - - uses: actions/checkout@v6 - - uses: ahmadnassri/action-dependabot-auto-merge@v2 + - name: Dependabot metadata + if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }} + id: metadata + uses: dependabot/fetch-metadata@v1 with: - target: minor - github-token: ${{ secrets.AUTO_MERGE }} + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Approve the PR + run: gh pr review --approve "$PR_URL" + + - name: Enable auto-merge + if: ${{ github.event.pull_request.user.login == 'pre-commit-ci[bot]' || steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'}} + run: gh pr merge --auto --merge "$PR_URL" diff --git a/.github/workflows/auto-merge-precommit.yml b/.github/workflows/auto-merge-precommit.yml deleted file mode 100644 index 4ab367a..0000000 --- a/.github/workflows/auto-merge-precommit.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: pre-commit auto-merge -on: pull_request - -permissions: - contents: write - pull-requests: write - -jobs: - auto-merge: - runs-on: ubuntu-latest - if: github.event.pull_request.title == '[pre-commit.ci] pre-commit autoupdate' - steps: - - name: Approve the PR - run: gh pr review --approve "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GH_TOKEN: ${{secrets.GITHUB_TOKEN}} - - name: Enable auto-merge - run: gh pr merge --auto --merge "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index 10d76a5..5382bfb 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -20,6 +20,6 @@ jobs: python-version: "3.10" - name: Publish the release notes - uses: release-drafter/release-drafter@v7.1.1 + uses: release-drafter/release-drafter@v7.2.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}