Skip to content

Commit a4f3268

Browse files
mansonamansona
committed
move to pnpm
1 parent 14238e0 commit a4f3268

10 files changed

Lines changed: 18162 additions & 18257 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,77 +24,79 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525

2626
strategy:
27+
fail-fast: false
2728
matrix:
2829
node-version: [16.x, 14.x]
2930
os: [ubuntu-latest, windows-latest]
3031

3132
steps:
3233
- name: Checkout Code
33-
uses: actions/checkout@v2
34+
uses: actions/checkout@v3
35+
- uses: pnpm/action-setup@v2
36+
with:
37+
version: 7
3438
- name: Use Node.js ${{ matrix.node-version }}
35-
uses: actions/setup-node@v2
39+
uses: actions/setup-node@v3
3640
with:
3741
node-version: ${{ matrix.node-version }}
38-
cache: yarn
39-
- name: Yarn Install
40-
run: yarn install --ignore-engines --frozen-lockfile
41-
- name: Run ember-cli-fastboot Tests
42-
run: yarn workspace ember-cli-fastboot test:ember
42+
cache: pnpm
43+
- run: pnpm install --frozen-lockfile
44+
- run: pnpm test:ember-cli-fastboot
4345
- name: Run fastboot Tests
4446
if: ${{ matrix.os != 'windows-latest' }}
45-
run: yarn workspace fastboot test
46-
- name: Run fastboot-express-middleware Tests
47-
run: yarn workspace fastboot-express-middleware test
48-
- name: Run fastboot-app-server Tests
49-
run: yarn workspace fastboot-app-server test:mocha
47+
run: pnpm test:fastboot
48+
- run: pnpm test:fastboot-express-middleware
49+
- run: pnpm test:fastboot-app-server
5050

5151
integration-tests:
5252
name: Integration Tests
5353
runs-on: ${{ matrix.os }}
5454

5555
strategy:
56+
fail-fast: false
5657
matrix:
5758
node-version: [16.x, 14.x]
5859
os: [ubuntu-latest, windows-latest]
5960

6061
steps:
6162
- name: Checkout Code
62-
uses: actions/checkout@v2
63+
uses: actions/checkout@v3
64+
- uses: pnpm/action-setup@v2
65+
with:
66+
version: 7
6367
- name: Use Node.js ${{ matrix.node-version }}
64-
uses: actions/setup-node@v2
68+
uses: actions/setup-node@v3
6569
with:
6670
node-version: ${{ matrix.node-version }}
67-
cache: yarn
68-
- name: Yarn Install
69-
run: yarn install --ignore-engines --frozen-lockfile
70-
- name: Integration Tests
71-
run: yarn workspace integration-tests test
71+
cache: pnpm
72+
- run: pnpm install --frozen-lockfile
73+
- run: pnpm test:integration
7274

7375
test-packages:
7476
name: Test Packages
7577
runs-on: ${{ matrix.os }}
7678

7779
strategy:
80+
fail-fast: false
7881
matrix:
7982
node-version: [16.x, 14.x]
8083
os: [ubuntu-latest, windows-latest]
8184

8285
steps:
8386
- name: Checkout Code
84-
uses: actions/checkout@v2
87+
uses: actions/checkout@v3
88+
- uses: pnpm/action-setup@v2
89+
with:
90+
version: 7
8591
- name: Use Node.js ${{ matrix.node-version }}
86-
uses: actions/setup-node@v2
92+
uses: actions/setup-node@v3
8793
with:
8894
node-version: ${{ matrix.node-version }}
89-
cache: yarn
90-
- name: Yarn Install
91-
run: yarn install --ignore-engines --frozen-lockfile
92-
- name: Basic App
93-
run: yarn workspace basic-app test:mocha
94-
- name: Custom App
95-
run: yarn workspace custom-fastboot-app test:mocha
96-
- name: Run ember-cli-fastboot-testing-app Tests
97-
run: yarn workspace ember-cli-fastboot-testing-app test:ember
95+
cache: pnpm
96+
- run: pnpm install --frozen-lockfile
97+
- run: pnpm --filter basic-app test:mocha
98+
- run: pnpm --filter custom-fastboot-app test:mocha
99+
- run: pnpm --filter ember-cli-fastboot-testing-app test:ember
98100

99101
test-legacy-mocha:
100102
name: Legacy Mocha Tests - ${{ matrix.node-version }}
@@ -107,17 +109,17 @@ jobs:
107109

108110
steps:
109111
- name: Checkout Code
110-
uses: actions/checkout@v2
112+
uses: actions/checkout@v3
113+
- uses: pnpm/action-setup@v2
114+
with:
115+
version: 7
111116
- name: Use Node.js ${{ matrix.node-version }}
112-
uses: volta-cli/action@v1
117+
uses: actions/setup-node@v3
113118
with:
114119
node-version: ${{ matrix.node-version }}
115-
- name: Yarn Install
116-
run: |
117-
yarn install --ignore-engines --frozen-lockfile
118-
- name: Run Mocha Tests
119-
run: |
120-
yarn workspace ember-cli-fastboot test:mocha
120+
cache: pnpm
121+
- run: pnpm install --frozen-lockfile
122+
- run: pnpm --filter ember-cli-fastboot test:mocha
121123

122124
try-scenarios:
123125
name: "ember-try for ember-cli-fastboot: ${{ matrix.ember-try-scenario }}"
@@ -144,11 +146,14 @@ jobs:
144146
- ember-release-no-deprecations
145147

146148
steps:
147-
- uses: actions/checkout@v2
148-
- uses: actions/setup-node@v2
149+
- uses: actions/checkout@v3
150+
- uses: pnpm/action-setup@v2
151+
with:
152+
version: 7
153+
- uses: actions/setup-node@v3
149154
with:
150155
node-version: 14
151-
cache: yarn
152-
- run: yarn install --ignore-engines --frozen-lockfile
156+
cache: pnpm
157+
- run: pnpm install --frozen-lockfile
153158
- name: test
154-
run: yarn workspace ember-cli-fastboot ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
159+
run: pnpm --filter ember-cli-fastboot exec ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ node_modules/
1818
yarn-error.log
1919

2020
# ember-try
21-
/.node_modules.ember-try/
22-
/bower.json.ember-try
23-
/package.json.ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

‎package.json‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,20 @@
55
"type": "git",
66
"url": "[email protected]:ember-fastboot/ember-cli-fastboot.git"
77
},
8-
"workspaces": [
9-
"packages/*",
10-
"test-packages/*"
11-
],
128
"scripts": {
139
"test": "npm-run-all test:*",
14-
"test:ember-cli-fastboot": "yarn workspace ember-cli-fastboot test:ember",
15-
"test:fastboot": "yarn workspace fastboot test",
16-
"test:fastboot-express-middleware": "yarn workspace fastboot-express-middleware test",
17-
"test:fastboot-app-server": "yarn workspace fastboot-app-server test:mocha",
18-
"test:integration": "yarn workspace integration-tests test",
19-
"test:extra": "yarn workspace basic-app test:mocha && yarn workspace custom-fastboot-app test:mocha"
10+
"test:ember-cli-fastboot": "pnpm --filter ember-cli-fastboot test:ember",
11+
"test:fastboot": "pnpm --filter fastboot test",
12+
"test:fastboot-express-middleware": "pnpm --filter fastboot-express-middleware test",
13+
"test:fastboot-app-server": "pnpm --filter fastboot-app-server test:mocha",
14+
"test:integration": "pnpm --filter integration-tests test",
15+
"test:extra": "pnpm --filter basic-app test:mocha && pnpm --filter custom-fastboot-app test:mocha"
2016
},
2117
"devDependencies": {
18+
"@release-it-plugins/lerna-changelog": "^5.0.0",
19+
"@release-it-plugins/workspaces": "^3.2.0",
2220
"npm-run-all": "^4.1.5",
23-
"release-it": "^14.2.2",
24-
"release-it-lerna-changelog": "^3.1.0",
25-
"release-it-yarn-workspaces": "^2.0.0"
21+
"release-it": "^14.2.2"
2622
},
2723
"publishConfig": {
2824
"registry": "https://registry.npmjs.org"
@@ -33,7 +29,7 @@
3329
"infile": "CHANGELOG.md",
3430
"launchEditor": true
3531
},
36-
"release-it-yarn-workspaces": {
32+
"@release-it-plugins/workspaces": {
3733
"workspaces": [
3834
"packages/*"
3935
],

‎packages/ember-cli-fastboot/config/ember-try.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
55

66
module.exports = async function () {
77
return {
8-
useYarn: true,
9-
// don't use default `--no-lockfile` option, which has been causing these to fail
10-
buildManagerOptions(/* scenario */) {
11-
return ['--ignore-engines'];
12-
},
8+
usePnpm: true,
139
scenarios: [
1410
{
1511
name: 'ember-lts-3.16',

0 commit comments

Comments
 (0)