Skip to content

Commit c32be7c

Browse files
author
Guy Bedford
authored
Replace Yarn with Npm (#936)
1 parent 08c9934 commit c32be7c

File tree

8 files changed

+19510
-10932
lines changed

8 files changed

+19510
-10932
lines changed

.github/actions/compute-sdk-test/action.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ runs:
2727
uses: actions/download-artifact@v3
2828
with:
2929
name: engine-release
30-
- run: yarn
31-
shell: bash
32-
- run: cd ./integration-tests/js-compute && yarn
33-
shell: bash
30+
- run: npm install
31+
- run: cd ./integration-tests/js-compute && npm install
3432
- run: cd ./integration-tests/js-compute && ./test.js --disable-starlingmonkey --local
35-
shell: bash

.github/workflows/main.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
- uses: actions/setup-node@v3
2121
with:
2222
node-version: 'lts/*'
23-
cache: 'yarn'
24-
- run: yarn install --immutable
23+
- run: npm ci
2524
- run: npm run format-changelog
2625

2726
check-docusaurus:
@@ -32,9 +31,8 @@ jobs:
3231
- uses: actions/setup-node@v3
3332
with:
3433
node-version: 'lts/*'
35-
cache: 'yarn'
36-
- run: cd documentation && yarn install
37-
- run: cd documentation && yarn build
34+
- run: cd documentation && npm install
35+
- run: cd documentation && npm run build
3836

3937
ensure_cargo_installs:
4038
name: Ensure that all required "cargo install" commands are run, or we have a cache hit
@@ -121,7 +119,6 @@ jobs:
121119
- uses: actions/setup-node@v3
122120
with:
123121
node-version: ${{ matrix.node-version }}
124-
cache: 'yarn'
125122
- name: Download Engine
126123
uses: actions/download-artifact@v3
127124
with:
@@ -130,8 +127,7 @@ jobs:
130127
uses: actions/download-artifact@v3
131128
with:
132129
name: fastly-debug
133-
- run: yarn
134-
shell: bash
130+
- run: npm install
135131
- run: npm test
136132

137133
build:
@@ -189,7 +185,6 @@ jobs:
189185
- uses: actions/setup-node@v3
190186
with:
191187
node-version: 'lts/*'
192-
cache: 'yarn'
193188

194189
- name: Download Engine
195190
uses: actions/download-artifact@v3
@@ -222,7 +217,7 @@ jobs:
222217
echo "bailing out from the build early"
223218
exit 1
224219
225-
- run: yarn install --frozen-lockfile
220+
- run: npm install
226221

227222
- name: Build WPT runtime
228223
run: tests/wpt-harness/build-wpt-runtime.sh ${{matrix.profile == 'weval' && '--enable-experimental-aot' || matrix.profile == 'debug' && '--debug-build' || ''}}
@@ -256,7 +251,6 @@ jobs:
256251
- uses: actions/setup-node@v3
257252
with:
258253
node-version: 'lts/*'
259-
cache: 'yarn'
260254

261255
- name: Set up Fastly CLI
262256
uses: fastly/compute-actions/setup@v4
@@ -293,10 +287,10 @@ jobs:
293287
with:
294288
name: fastly-${{ matrix.profile }}-ic-cache
295289

296-
- run: yarn install --frozen-lockfile
290+
- run: npm install
297291

298-
- name: Yarn install
299-
run: yarn && cd ./integration-tests/js-compute && yarn
292+
- name: Npm install
293+
run: npm install && cd ./integration-tests/js-compute && npm install
300294

301295
- run: SUFFIX_STRING=${{matrix.profile}} node integration-tests/js-compute/test.js ${{ matrix.platform == 'viceroy' && '--local' || '' }} ${{ matrix.profile == 'weval' && '--aot' || '' }} ${{ matrix.profile == 'debug' && '--debug-build' || '' }}
302296
env:

.github/workflows/release-please.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,18 @@ jobs:
4242
uses: actions/setup-node@v3
4343
with:
4444
node-version: 'lts/*'
45-
cache: 'yarn'
4645

47-
- run: yarn install --mode=update-lockfile
46+
- run: npm install --mode=update-lockfile
4847
working-directory: ./documentation
4948
- run: npm run docusaurus docs:version "$(npm pkg get version --json --prefix=../ | jq -r)"
5049
working-directory: ./documentation
5150

52-
- run: yarn install --mode=update-lockfile
51+
- run: npm install --mode=update-lockfile
5352
working-directory: ./documentation/app
5453
- run: npm run build:files
5554
working-directory: ./documentation/app
5655

57-
- run: yarn && npm run format-changelog
56+
- run: npm install && npm run format-changelog
5857

5958
- name: Committing and push changes
6059
run: |
@@ -119,7 +118,6 @@ jobs:
119118
uses: actions/setup-node@v3
120119
with:
121120
node-version: 'lts/*'
122-
cache: 'yarn'
123121
registry-url: 'https://registry.npmjs.org'
124122

125123
- name: Restore wasm-tools from cache
@@ -129,7 +127,7 @@ jobs:
129127
path: "/home/runner/.cargo/bin/wasm-tools"
130128
key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}
131129

132-
- run: yarn install --immutable
130+
- run: npm install --immutable
133131

134132
- name: Download Engine Release
135133
uses: actions/download-artifact@v3
@@ -168,7 +166,7 @@ jobs:
168166
env:
169167
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170168

171-
- run: yarn
169+
- run: npm install
172170
working-directory: ./documentation
173171

174172
- name: Set up Fastly CLI
@@ -177,7 +175,7 @@ jobs:
177175
token: ${{ secrets.GITHUB_TOKEN }}
178176
cli_version: '7.0.1'
179177

180-
- run: yarn deploy
178+
- run: npm run deploy
181179
timeout-minutes: 120
182180
env:
183181
FASTLY_API_TOKEN: ${{secrets.FASTLY_API_TOKEN}}

0 commit comments

Comments
 (0)