Skip to content

Commit e67911e

Browse files
committed
Bumps node modules
1 parent 1732bb3 commit e67911e

4 files changed

Lines changed: 34 additions & 54 deletions

File tree

.github/workflows/dependabot-auto-merge.yml renamed to .github/workflows/auto-merge.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pill-request-auto-merge
1+
name: auto-merge
22

33
on:
44
pull_request:
@@ -10,7 +10,8 @@ permissions:
1010
jobs:
1111
pull-request-auto-merge:
1212
runs-on: ubuntu-latest
13-
if: github.actor == 'dependabot[bot]'
13+
# リポジトリオーナーの Pull Request はドラフト以外は自動マージを有効にする
14+
if: ${{ github.event.pull_request.draft == false && (github.actor == 'dependabot[bot]' || github.repository_owner == github.actor) }}
1415
steps:
1516
- uses: actions/checkout@v5
1617

.github/workflows/test.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,3 @@ jobs:
3232
3333
- name: Build
3434
run: pnpm all
35-
36-
configure:
37-
38-
permissions:
39-
pull-requests: write
40-
contents: write
41-
42-
runs-on: ubuntu-latest
43-
44-
# リポジトリオーナーの Pull Request はドラフト以外は自動マージを有効にする
45-
if: ${{ github.event.pull_request.draft == false && (github.actor != 'dependabot[bot]' || github.repository_owner == github.actor) }}
46-
47-
steps:
48-
- name: Enable auto-merge for Pull Request
49-
run: |
50-
gh pr review --approve "$PR_URL"
51-
gh pr merge --auto --squash "$PR_URL"
52-
env:
53-
PR_URL: ${{github.event.pull_request.html_url}}
54-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
55-

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@next/eslint-plugin-next": "^15.5.4",
3636
"@stylistic/eslint-plugin": "^5.4.0",
3737
"@types/mdx": "^2.0.13",
38-
"@types/node": "^24.7.0",
38+
"@types/node": "^24.7.1",
3939
"@types/react": "^19.2.2",
4040
"@types/react-dom": "^19.2.1",
4141
"eslint": "^9.37.0",
@@ -47,10 +47,10 @@
4747
"eslint-plugin-jsx-a11y": "^6.10.2",
4848
"eslint-plugin-react": "^7.37.5",
4949
"eslint-plugin-react-hooks": "^7.0.0",
50-
"pnpm": "^10.18.1",
50+
"pnpm": "^10.18.2",
5151
"rimraf": "^6.0.1",
5252
"typescript": "^5.9.3",
5353
"typescript-eslint": "^8.46.0"
5454
},
55-
"packageManager": "pnpm@10.18.1"
55+
"packageManager": "pnpm@10.18.2"
5656
}

pnpm-lock.yaml

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)