Skip to content

Commit 8e4384c

Browse files
authored
Merge pull request #1269 from pichfl/mainmatter/pnpm
Move to pnpm
2 parents b2baf36 + 99c7058 commit 8e4384c

File tree

5 files changed

+12249
-20031
lines changed

5 files changed

+12249
-20031
lines changed

.github/workflows/ci.yml

Lines changed: 38 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,31 @@ on:
55
workflow_dispatch:
66
push:
77
branches:
8-
- master
8+
- master
99
pull_request:
1010

1111
jobs:
1212
lint:
1313
runs-on: ubuntu-latest
14-
1514
steps:
16-
- uses: actions/checkout@v4
17-
- uses: actions/setup-node@v4
18-
with:
19-
node-version: 20
20-
cache: 'npm'
21-
22-
- run: npm ci
23-
- run: npm run lint
15+
- uses: actions/checkout@v4
16+
- uses: pnpm/action-setup@v4
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version: 22
20+
cache: pnpm
21+
- run: pnpm install
22+
- run: pnpm run lint
2423

2524
test:
26-
needs: lint
27-
25+
runs-on: ${{ matrix.os }}
2826
strategy:
2927
fail-fast: false
3028
matrix:
3129
os:
3230
- ubuntu-latest
3331
- macos-latest
34-
node:
32+
node-version:
3533
- 20
3634
- 22
3735
- 24
@@ -41,43 +39,38 @@ jobs:
4139
exclude:
4240
- os: macos-latest
4341
test-command: test:fast
44-
45-
runs-on: ${{ matrix.os }}
46-
4742
steps:
48-
- uses: actions/checkout@v4
49-
- uses: actions/setup-node@v4
50-
with:
51-
node-version: ${{ matrix.node }}
52-
cache: 'npm'
53-
54-
# for test cache hits
55-
- run: npm i -g [email protected]
56-
57-
- run: npm ci
58-
- run: npm run ${{ matrix.test-command }} -- --retries 1
59-
timeout-minutes: 20
60-
env:
61-
NODE_LTS: ${{ matrix.node != '*' }}
62-
DEBUG: ember-cli-update,boilerplate-update,git-diff-apply
43+
- uses: actions/checkout@v4
44+
- uses: pnpm/action-setup@v4
45+
- name: Setup Node.js ${{ matrix.node-version }}
46+
uses: actions/setup-node@v4
47+
with:
48+
node-version: ${{ matrix.node-version }}
49+
cache: pnpm
50+
# for test cache hits
51+
- run: pnpm add -g [email protected]
52+
- run: pnpm install
53+
- run: pnpm run ${{ matrix.test-command }} -- --retries 1
54+
timeout-minutes: 20
55+
env:
56+
NODE_LTS: ${{ matrix.node != '*' }}
57+
DEBUG: ember-cli-update,boilerplate-update,git-diff-apply
6358

6459
ember-cli-update:
6560
needs: test
6661
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
6762

6863
runs-on: ubuntu-latest
69-
7064
steps:
71-
- uses: actions/checkout@v4
72-
with:
73-
ref: ${{ github.head_ref }}
74-
75-
- uses: actions/setup-node@v4
76-
with:
77-
node-version: 20
78-
cache: 'npm'
79-
80-
- uses: kellyselden/ember-cli-update-action@v5
81-
with:
82-
autofix_command: npm run lint -- --fix
83-
ignore_to: true
65+
- uses: actions/checkout@v4
66+
with:
67+
ref: ${{ github.head_ref }}
68+
- uses: pnpm/action-setup@v4
69+
- uses: actions/setup-node@v4
70+
with:
71+
node-version: 22
72+
cache: pnpm
73+
- uses: kellyselden/ember-cli-update-action@v5
74+
with:
75+
autofix_command: npm run lint -- --fix
76+
ignore_to: true

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The CLI attempts to be a thin wrapper of [boilerplate-update](https://github.com
2323

2424
As a global executable:
2525

26-
`npm install -g ember-cli-update`
26+
`pnpm add -g ember-cli-update`
2727

2828
As an Ember CLI command:
2929

@@ -276,7 +276,7 @@ Let's update from Ember CLI 2.18.2 to Ember CLI 3.1.4
276276
First, make sure you are on the latest ember-cli-update version for good measure.
277277

278278
```
279-
npm install -g ember-cli-update
279+
pnpm add -g ember-cli-update
280280
```
281281

282282
Then, run all compatible codemods against your current version. Since codemods are downloaded on the fly, they can be updated (and new ones added) without even getting a new version of ember-cli-update. Also, we may add additional codemods targeting your older version of Ember.js.

0 commit comments

Comments
 (0)