Skip to content

Commit 07ca9a2

Browse files
authored
Merge pull request #1202 from ember-cli/renovate/kellyselden-node-template-3.x
Update dependency @kellyselden/node-template to v3
2 parents 972ec80 + 355af98 commit 07ca9a2

File tree

7 files changed

+261
-19631
lines changed

7 files changed

+261
-19631
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ module.exports = {
3333
],
3434
rules: {
3535
'mocha/no-exclusive-tests': 'error',
36+
'mocha/no-empty-description': 'off',
3637
'mocha/no-setup-in-describe': 'off',
3738
'mocha/no-hooks-for-single-case': 'off'
3839
}

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v3
2020
- uses: actions/setup-node@v3
2121
with:
22-
node-version: 12
22+
node-version: 14
2323

2424
- run: npm ci
2525
- run: npm run lint
@@ -33,7 +33,7 @@ jobs:
3333
- ubuntu-latest
3434
- macos-latest
3535
node:
36-
- 12
36+
- 14
3737
# - '*'
3838
test-command:
3939
- test:bin
@@ -42,7 +42,7 @@ jobs:
4242
# - os: macos-latest
4343
# node: '*'
4444
- os: macos-latest
45-
node: 12
45+
node: 14
4646
test-command: test:fast
4747

4848
runs-on: ${{ matrix.os }}
@@ -76,7 +76,7 @@ jobs:
7676
token: ${{ secrets.GitHubToken }}
7777
- uses: actions/setup-node@v3
7878
with:
79-
node-version: 12
79+
node-version: 14
8080

8181
- uses: kellyselden/ember-cli-update-action@v3
8282
with:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- uses: actions/setup-node@v3
1414
with:
15-
node-version: 12
15+
node-version: 14
1616
registry-url: 'https://registry.npmjs.org'
1717

1818
- run: npm publish

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
environment:
22
matrix:
3-
# node 12.18 has a regression
3+
# node 14.5 has a regression
44
# npm ERR! cb.apply is not a function
5-
# - nodejs_version: "12"
6-
- nodejs_version: "12.17"
5+
# - nodejs_version: "14"
6+
- nodejs_version: "14.4"
77
DEBUG: "ember-cli-update,boilerplate-update,git-diff-apply"
88

99
branches:
@@ -24,7 +24,7 @@ install:
2424
- RefreshEnv
2525
- where npx
2626
# don't accidentally use the global npx
27-
- ps: rm "C:\Program Files (x86)\nodejs\npx*"
27+
- ps: rm "C:\Program Files\nodejs\npx*"
2828
- ps: rm C:\Users\appveyor\AppData\Roaming\npm\npx*
2929
# test that we can't find it
3030
- ps: if (gcm npx) { exit }

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
{
1515
"name": "@kellyselden/node-template",
16-
"version": "2.2.2",
16+
"version": "3.0.0",
1717
"blueprints": [
1818
{
1919
"name": "@kellyselden/node-template",

0 commit comments

Comments
 (0)