Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/dependabot-auto-merge.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ updates:
rebase-strategy: auto
assignees:
- poad
groups:
actions:
patterns:
- '*'

- package-ecosystem: npm
directory: '/'
Expand Down
29 changes: 14 additions & 15 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
name: auto-merge
name: pull-request-auto-merge

on:
pull_request:
branches: [ main ]

permissions:
id-token: write
contents: read

contents: write
pull-requests: write
checks: write

jobs:
configure:
pull-request-auto-merge:
runs-on: ubuntu-latest
if: github.actor != 'dependabot[bot]'
steps:
- name: Pull request auto merge enabler
if: github.event_name == 'pull_request'
uses: poad/github-pull-request-auto-merge[email protected]
with:
pull_request_number: ${{ github.event.pull_request.number }}
github_token: ${{ secrets.PERSONAL_TOKEN_FOR_GITHUB_ACTIONS }}
repository: ${{ github.event.repository.name }}
owner: ${{ github.repository_owner }}
merge_method: SQUASH
- uses: actions/checkout@v4

- name: Enable auto-merge for Pull Request
run: |
gh pr review --approve "$PR_URL"
gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

strategy:
matrix:
node-version: [18.x, 20.x]
node-version: [22.x]

steps:
- name: Checkout
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/dependabot-auto-merge.yml

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
"pnpm": {
"overrides": {
"cross-spawn@<7.0.5": ">=7.0.5",
"webpack": ">=5.94.0"
"webpack": ">=5.94.0",
"webpack@>=5.0.0-alpha.0 <5.94.0": ">=5.94.0"
}
}
}
Loading