diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 303f38a..b6f9d7c 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -19,17 +19,10 @@ permissions: contents: write pull-requests: write - if: github.event.pull_request.user.login == 'dependabot[bot]' || - github.event.pull_request.user.login == 'pre-commit-ci[bot]' runs-on: ubuntu-latest steps: - name: Enable Auto-Merge (Squash) - run: gh pr merge ${{ github.event.pull_request.html_url }} --auto --squash - env: - GH_TOKEN: ${{ github.token }} - - name: Enable Merge-on-green - run: | - gh pr edit ${{ github.event.pull_request.html_url }} --add-label "automerge: exact" - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true + uses: liblaf/template/.github/actions/merge@main + with: + pr: ${{ github.event.pull_request.html_url }} + user: ${{ github.event.pull_request.user.login }} diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index 23cedae..9778bb4 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -19,3 +19,4 @@ uses: liblaf/template/.github/actions/pre-commit@main with: autofix: true + token: ${{ secrets.GH_TOKEN }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0fa03ec..d98ea90 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ ci: - autofix_commit_msg: "ci(pre-commit): auto fixes from pre-commit.com hooks" + autofix_commit_msg: "ci(pre-commit): auto fixes from pre-commit hooks" autoupdate_commit_msg: "ci(pre-commit): pre-commit autoupdate" skip: - cargo-check