Skip to content

Commit

Permalink
ci: sync with template repository
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Feb 16, 2024
1 parent 078a736 commit a624504
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,10 @@ jobs:
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 }}
1 change: 1 addition & 0 deletions .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ jobs:
uses: liblaf/template/.github/actions/pre-commit@main
with:
autofix: true
token: ${{ secrets.GH_TOKEN }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit a624504

Please sign in to comment.