Skip to content

Commit e513e7d

Browse files
committed
chore: ember-cli-update-action
ember-cli-update -p @kellyselden/node-template -b @kellyselden/node-template --to 6.10.0
1 parent 82c013b commit e513e7d

6 files changed

Lines changed: 31 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v5
17-
- uses: actions/setup-node@v4
17+
- uses: actions/setup-node@v5
1818
with:
1919
node-version: 20
2020

@@ -46,7 +46,7 @@ jobs:
4646

4747
steps:
4848
- uses: actions/checkout@v5
49-
- uses: actions/setup-node@v4
49+
- uses: actions/setup-node@v5
5050
with:
5151
node-version: ${{ matrix.node }}
5252

@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
ref: ${{ github.head_ref }}
7474
token: ${{ secrets.GitHubToken }}
75-
- uses: actions/setup-node@v4
75+
- uses: actions/setup-node@v5
7676
with:
7777
node-version: 20
7878

.github/workflows/publish.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v5
15+
<<<<<<< HEAD
1516

1617
with:
1718
fetch-depth: 0
@@ -21,6 +22,9 @@ jobs:
2122
git config user.email github-actions@github.com
2223
2324
- uses: actions/setup-node@v4
25+
=======
26+
- uses: actions/setup-node@v5
27+
>>>>>>> a267929 (v6.9.0...v6.10.0)
2428
with:
2529
node-version: 20
2630

.mocharc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
'use strict';
22

33
module.exports = {
4+
<<<<<<< HEAD
45
spec: ['test/**/*-test.js'],
56

7+
=======
8+
spec: [
9+
'test/**/*-test.js',
10+
],
11+
>>>>>>> a267929 (v6.9.0...v6.10.0)
612
ignore: [
713
'test/fixtures/**',
814
],

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": "6.9.0",
16+
"version": "6.10.0",
1717
"blueprints": [
1818
{
1919
"name": "@kellyselden/node-template",

eslint.config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ const saneNode = require('eslint-config-sane-node');
1010

1111
module.exports = defineConfig([
1212
saneNode,
13+
{
14+
files: [
15+
'bin/*.js',
16+
],
17+
rules: {
18+
'no-console': 'off',
19+
},
20+
},
1321
{
1422
...mocha.configs.flat.recommended,
1523
files: [

renovate.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{
22
"extends": [
33
"standard"
4+
],
5+
"packageRules": [
6+
{
7+
"matchPackageNames": [
8+
"standard-node-template",
9+
"@kellyselden/node-template"
10+
],
11+
"separateMinorPatch": true
12+
}
413
]
514
}

0 commit comments

Comments
 (0)