Skip to content

Commit

Permalink
Merge pull request #407 from alexwilson/upgrade-to-node20
Browse files Browse the repository at this point in the history
Upgrade to node20
  • Loading branch information
alexwilson authored Feb 17, 2024
2 parents 5e7478b + 984dc0b commit 56e3117
Show file tree
Hide file tree
Showing 9 changed files with 8,894 additions and 9,090 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/auto-merge-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
# Specifically check the creator of the pull-request, not the actor.
if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
steps:
- name: Checkout
uses: actions/checkout@master
with:
fetch-depth: 1
- id: enable-automerge
name: Enable Github Automerge
uses: ./
with:
github-token: "${{ secrets.ENABLE_AUTOMERGE_ACTION_TOKEN }}"
- name: Checkout
uses: actions/checkout@main
with:
fetch-depth: 1
- id: enable-automerge
name: Enable Github Automerge
uses: ./
with:
github-token: "${{ secrets.ENABLE_AUTOMERGE_ACTION_TOKEN }}"

# Reference hmarr/auto-approve-action by commit SHA as it is an immutable reference to a
# known, "trusted" version of this 3rd party code.
Expand All @@ -36,7 +36,7 @@ jobs:
# Specifically check the creator of the pull-request, not the actor.
if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
steps:
- id: auto-approve-dependabot
uses: hmarr/auto-approve-action@bca9db08da72b576ae3273e776e7ccf3f0a36e12
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- id: auto-approve-dependabot
uses: hmarr/auto-approve-action@8f929096a962e83ccdfa8afcf855f39f12d4dac7
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
28 changes: 15 additions & 13 deletions .github/workflows/rebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
with:
fetch-depth: 1
- uses: actions/setup-node@master
- name: Install Dependencies
run: npm ci --ignore-scripts
- name: Build
run: npm run build
- uses: stefanzweifel/git-auto-commit-action@v4
with:
file_pattern: --force dist/*
commit_message: "chore: 🛠 Rebuild action!"
- name: Checkout
uses: actions/checkout@main
with:
fetch-depth: 1
- uses: actions/setup-node@main
with:
node-version-file: ".nvmrc"
- name: Install Dependencies
run: npm ci --ignore-scripts
- name: Build
run: npm run build
- uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
with:
file_pattern: --force dist/*
commit_message: "chore: 🛠 Rebuild action!"
27 changes: 14 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@ on:
pull_request:
schedule:
# Scheduled build so failures are noticed quicker.
- cron: '17 4 * * 2,5'

- cron: "17 4 * * 2,5"

jobs:
# Lint & build
test:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
with:
fetch-depth: 1
- uses: actions/setup-node@master
- name: Install Dependencies
run: npm ci --ignore-scripts
- name: Lint
run: npm run format-check
- name: Build
run: npm run build
- name: Checkout
uses: actions/checkout@main
with:
fetch-depth: 1
- uses: actions/setup-node@main
with:
node-version-file: ".nvmrc"
- name: Install Dependencies
run: npm ci --ignore-scripts
- name: Lint
run: npm run format-check
- name: Build
run: npm run build
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12
v20
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Name: `alexwilson/enable-github-automerge-action`

## 1) What is this?

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.
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.

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

Expand Down
16 changes: 8 additions & 8 deletions action.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: 'Enable Github Automerge'
description: 'Enable Github auto-merge for specific pull-requests'
name: "Enable Github Automerge"
description: "Enable Github auto-merge for specific pull-requests"
branding:
icon: 'git-merge'
color: 'green'
icon: "git-merge"
color: "green"
inputs:
github-token:
description: 'The GITHUB_TOKEN secret'
description: "The GITHUB_TOKEN secret"
required: true
merge-method:
description: 'Preferred merge method for automatic merges.'
description: "Preferred merge method for automatic merges."
required: false
runs:
using: 'node16'
main: 'dist/index.js'
using: "node20"
main: "dist/index.js"
Loading

0 comments on commit 56e3117

Please sign in to comment.