Skip to content

Commit 56e3117

Browse files
authored
Merge pull request #407 from alexwilson/upgrade-to-node20
Upgrade to node20
2 parents 5e7478b + 984dc0b commit 56e3117

File tree

9 files changed

+8894
-9090
lines changed

9 files changed

+8894
-9090
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
# Specifically check the creator of the pull-request, not the actor.
1717
if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
1818
steps:
19-
- name: Checkout
20-
uses: actions/checkout@master
21-
with:
22-
fetch-depth: 1
23-
- id: enable-automerge
24-
name: Enable Github Automerge
25-
uses: ./
26-
with:
27-
github-token: "${{ secrets.ENABLE_AUTOMERGE_ACTION_TOKEN }}"
19+
- name: Checkout
20+
uses: actions/checkout@main
21+
with:
22+
fetch-depth: 1
23+
- id: enable-automerge
24+
name: Enable Github Automerge
25+
uses: ./
26+
with:
27+
github-token: "${{ secrets.ENABLE_AUTOMERGE_ACTION_TOKEN }}"
2828

2929
# Reference hmarr/auto-approve-action by commit SHA as it is an immutable reference to a
3030
# known, "trusted" version of this 3rd party code.
@@ -36,7 +36,7 @@ jobs:
3636
# Specifically check the creator of the pull-request, not the actor.
3737
if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
3838
steps:
39-
- id: auto-approve-dependabot
40-
uses: hmarr/auto-approve-action@bca9db08da72b576ae3273e776e7ccf3f0a36e12
41-
with:
42-
github-token: "${{ secrets.GITHUB_TOKEN }}"
39+
- id: auto-approve-dependabot
40+
uses: hmarr/auto-approve-action@8f929096a962e83ccdfa8afcf855f39f12d4dac7
41+
with:
42+
github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/rebuild.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@ jobs:
1212
name: Build
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Checkout
16-
uses: actions/checkout@master
17-
with:
18-
fetch-depth: 1
19-
- uses: actions/setup-node@master
20-
- name: Install Dependencies
21-
run: npm ci --ignore-scripts
22-
- name: Build
23-
run: npm run build
24-
- uses: stefanzweifel/git-auto-commit-action@v4
25-
with:
26-
file_pattern: --force dist/*
27-
commit_message: "chore: 🛠 Rebuild action!"
15+
- name: Checkout
16+
uses: actions/checkout@main
17+
with:
18+
fetch-depth: 1
19+
- uses: actions/setup-node@main
20+
with:
21+
node-version-file: ".nvmrc"
22+
- name: Install Dependencies
23+
run: npm ci --ignore-scripts
24+
- name: Build
25+
run: npm run build
26+
- uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
27+
with:
28+
file_pattern: --force dist/*
29+
commit_message: "chore: 🛠 Rebuild action!"

.github/workflows/test.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ on:
55
pull_request:
66
schedule:
77
# Scheduled build so failures are noticed quicker.
8-
- cron: '17 4 * * 2,5'
9-
8+
- cron: "17 4 * * 2,5"
109

1110
jobs:
1211
# Lint & build
1312
test:
1413
name: Test
1514
runs-on: ubuntu-latest
1615
steps:
17-
- name: Checkout
18-
uses: actions/checkout@master
19-
with:
20-
fetch-depth: 1
21-
- uses: actions/setup-node@master
22-
- name: Install Dependencies
23-
run: npm ci --ignore-scripts
24-
- name: Lint
25-
run: npm run format-check
26-
- name: Build
27-
run: npm run build
16+
- name: Checkout
17+
uses: actions/checkout@main
18+
with:
19+
fetch-depth: 1
20+
- uses: actions/setup-node@main
21+
with:
22+
node-version-file: ".nvmrc"
23+
- name: Install Dependencies
24+
run: npm ci --ignore-scripts
25+
- name: Lint
26+
run: npm run format-check
27+
- name: Build
28+
run: npm run build

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12
1+
v20

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Name: `alexwilson/enable-github-automerge-action`
1010

1111
## 1) What is this?
1212

13-
To speed up some of your workflows, this action allows you to automatically enable [Auto-Merge](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request) in your Github pull-requests.
13+
To speed up some of your workflows, this action allows you to automatically enable [Auto-Merge](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request) in your Github pull-requests.
1414

1515
When enabled, auto-merge will merge pull-requests automatically _as soon as all requirements are met_ (i.e. approvals, passing tests).
1616

action.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
name: 'Enable Github Automerge'
2-
description: 'Enable Github auto-merge for specific pull-requests'
1+
name: "Enable Github Automerge"
2+
description: "Enable Github auto-merge for specific pull-requests"
33
branding:
4-
icon: 'git-merge'
5-
color: 'green'
4+
icon: "git-merge"
5+
color: "green"
66
inputs:
77
github-token:
8-
description: 'The GITHUB_TOKEN secret'
8+
description: "The GITHUB_TOKEN secret"
99
required: true
1010
merge-method:
11-
description: 'Preferred merge method for automatic merges.'
11+
description: "Preferred merge method for automatic merges."
1212
required: false
1313
runs:
14-
using: 'node16'
15-
main: 'dist/index.js'
14+
using: "node20"
15+
main: "dist/index.js"

0 commit comments

Comments
 (0)