Skip to content

Commit 0247a49

Browse files
yarn -> pnpm
1 parent ec85fdb commit 0247a49

File tree

3 files changed

+23
-28
lines changed

3 files changed

+23
-28
lines changed

.github/workflows/ci.yml

+13-26
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,14 @@ jobs:
2222
- name: Install Node
2323
uses: actions/setup-node@v3
2424
with:
25-
node-version: 18
26-
cache: yarn
27-
- name: Install Dependencies
28-
run: yarn install --frozen-lockfile
29-
- name: Lint
30-
run: yarn lint
31-
- name: Run Tests
32-
run: yarn test:ember
33-
34-
floating:
35-
name: "Floating Dependencies"
36-
runs-on: ubuntu-latest
37-
timeout-minutes: 10
38-
39-
steps:
40-
- uses: actions/checkout@v3
41-
- uses: actions/setup-node@v3
25+
node-version: 18.x
26+
- uses: pnpm/action-setup@v2
4227
with:
43-
node-version: 18
44-
cache: yarn
28+
version: 8
4529
- name: Install Dependencies
46-
run: yarn install --no-lockfile
30+
run: pnpm install --frozen-lockfile
4731
- name: Run Tests
48-
run: yarn test:ember
49-
32+
run: pnpm test
5033
try-scenarios:
5134
name: ${{ matrix.try-scenario }}
5235
runs-on: ubuntu-latest
@@ -59,6 +42,7 @@ jobs:
5942
try-scenario:
6043
- ember-lts-4.8
6144
- ember-lts-4.12
45+
- ember-lts-5.4
6246
- ember-release
6347
- ember-beta
6448
- ember-canary
@@ -70,9 +54,12 @@ jobs:
7054
- name: Install Node
7155
uses: actions/setup-node@v3
7256
with:
73-
node-version: 18
74-
cache: yarn
57+
node-version: 18.x
58+
- uses: pnpm/action-setup@v2
59+
with:
60+
version: 8
7561
- name: Install Dependencies
76-
run: yarn install --frozen-lockfile
62+
run: pnpm install --frozen-lockfile
7763
- name: Run Tests
78-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
64+
working-directory: test-app
65+
run: pnpm ember try:one ${{ matrix.try-scenario }}

tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"codemodsSource": "ember-addon-codemods-manifest@1",
1212
"isBaseBlueprint": true,
1313
"options": [
14-
"--yarn",
14+
"--pnpm",
1515
"--no-welcome"
1616
]
1717
}

tests/dummy/config/ember-try.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
55

66
module.exports = async function () {
77
return {
8-
useYarn: true,
8+
usePnpm: true,
99
scenarios: [
1010
{
1111
name: 'ember-lts-4.8',
@@ -23,6 +23,14 @@ module.exports = async function () {
2323
},
2424
},
2525
},
26+
{
27+
name: 'ember-lts-5.4',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': '~5.4.0',
31+
},
32+
},
33+
},
2634
{
2735
name: 'ember-release',
2836
npm: {

0 commit comments

Comments
 (0)