Skip to content

Commit 6ebcf3a

Browse files
committed
chore: ember-cli-update-action
ember-cli-update -p @kellyselden/node-template -b @kellyselden/node-template --to 6.11.1
1 parent 1be0b83 commit 6ebcf3a

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,24 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v5
17+
1718
- uses: actions/setup-node@v5
1819
with:
1920
node-version: 20
2021

22+
<<<<<<< HEAD
2123
- uses: pnpm/[email protected]
2224
with:
2325
version: 10.15.1
2426

2527
- run: pnpm install
2628
- run: npm run lint:git
2729
- run: npm run lint:js
30+
=======
31+
- run: npm ci
32+
33+
- run: npm run lint
34+
>>>>>>> 8c794af (v6.11.0...v6.11.1)
2835

2936
test:
3037
needs: lint
@@ -46,15 +53,21 @@ jobs:
4653

4754
steps:
4855
- uses: actions/checkout@v5
56+
4957
- uses: actions/setup-node@v5
5058
with:
5159
node-version: ${{ matrix.node }}
5260

61+
<<<<<<< HEAD
5362
- uses: pnpm/[email protected]
5463
with:
5564
version: 10.15.1
5665

5766
- run: pnpm install
67+
=======
68+
- run: npm ci
69+
70+
>>>>>>> 8c794af (v6.11.0...v6.11.1)
5871
- run: npm test
5972
continue-on-error: ${{ matrix.os == 'macos-latest' }}
6073
env:
@@ -72,6 +85,7 @@ jobs:
7285
with:
7386
ref: ${{ github.head_ref }}
7487
token: ${{ secrets.GitHubToken }}
88+
7589
- uses: actions/setup-node@v5
7690
with:
7791
node-version: 20

.github/workflows/publish.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v5
1515

16+
<<<<<<< HEAD
1617
with:
1718
fetch-depth: 0
1819

1920
- run: |
2021
git config user.name github-actions
2122
git config user.email [email protected]
2223
24+
=======
25+
>>>>>>> 8c794af (v6.11.0...v6.11.1)
2326
- uses: actions/setup-node@v5
2427
with:
2528
node-version: 20

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

0 commit comments

Comments
 (0)