Skip to content

Commit

Permalink
Merge branch 'main' into deps_eslint_node_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tonycoco committed Mar 26, 2024
2 parents ab328ad + 0bd8195 commit bcbd757
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 114 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [ $default-branch ]
branches: [$default-branch]
pull_request:
name: ci
jobs:
Expand All @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18]
node: [14, 16, 18, 20, 21]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
Expand All @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- run: npm ci
- run: npm run system-test
system_test:
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- run: npm ci
- run: npm run system-test
lint:
Expand All @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- run: npm ci
- run: npm run lint
license_check:
Expand All @@ -56,6 +56,6 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- run: npm ci
- run: npm run license-check
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
registry-url: 'https://wombat-dressing-room.appspot.com'
- run: npm ci
- run: npm publish
Expand Down
171 changes: 78 additions & 93 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"chalk": "^4.1.2",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-n": "15.7.0",
"eslint-plugin-prettier": "5.1.3",
"execa": "^5.0.0",
"inquirer": "^7.3.3",
Expand All @@ -64,7 +64,6 @@
"@types/mocha": "^10.0.0",
"@types/ncp": "^2.0.4",
"@types/node": "20.11.30",
"@types/prettier": "^3.0.0",
"@types/rimraf": "^3.0.0",
"@types/sinon": "^17.0.0",
"@types/tmp": "^0.2.0",
Expand Down
Loading

0 comments on commit bcbd757

Please sign in to comment.