Skip to content

Commit 9727bdf

Browse files
Jake ChampionJakeChampion
authored andcommitted
update ci to use js cli
1 parent ceb461e commit 9727bdf

File tree

2 files changed

+10
-42
lines changed

2 files changed

+10
-42
lines changed

.github/actions/e2e/action.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,12 @@ runs:
1919
wget https://github.com/fastly/cli/releases/download/v3.1.1/fastly_3.1.1_linux_amd64.deb
2020
sudo apt install ./fastly_3.1.1_linux_amd64.deb
2121
22-
- name: Download x86_64 Linux binaries
22+
- name: Download Engine
2323
uses: actions/download-artifact@v1
2424
with:
25-
name: bins-x86_64-linux
26-
27-
# Move the downloaded binary from the build step into the bins directory in
28-
# the integration-tests directory
29-
- name: Move x86_64 Linux binaries
25+
name: engine-release
26+
- run: SKIP_BUILD=1 npm ci
3027
shell: bash
31-
run: |
32-
arch="x86_64"
33-
platform="linux"
34-
35-
mkdir -p "./target/release"
36-
mv "bins-$arch-$platform/js-compute-runtime" "./target/release/js-compute-runtime"
37-
38-
chmod +x ./target/release/js-compute-runtime
39-
./target/release/js-compute-runtime --help
40-
4128
- run: cd ./integration-tests/js-compute && npm ci
4229
shell: bash
4330
- run: cd ./integration-tests/js-compute && ./test.js ${{ inputs.fixture }}

.github/workflows/main.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ defaults:
1212
run:
1313
shell: bash
1414
env:
15-
wizer_version: 1.3.3
1615
viceroy_version: 0.2.15
1716

1817
jobs:
@@ -99,9 +98,6 @@ jobs:
9998
strategy:
10099
matrix:
101100
include:
102-
- crate: wizer
103-
version: 1.3.3 # Note: workflow-level env vars can't be used in matrix definitions
104-
options: "--all-features"
105101
- crate: viceroy
106102
version: 0.2.15 # Note: workflow-level env vars can't be used in matrix definitions
107103
options: ""
@@ -136,17 +132,13 @@ jobs:
136132
with:
137133
name: engine-${{ matrix.profile }}
138134

139-
- name: Restore Wizer from cache
140-
uses: actions/[email protected]
141-
with:
142-
path: "/home/runner/.cargo/bin/wizer"
143-
key: crate-cache-wizer-${{ env.wizer_version }}
144-
145135
- name: Restore Viceroy from cache
146136
uses: actions/[email protected]
147137
with:
148138
path: "/home/runner/.cargo/bin/viceroy"
149139
key: crate-cache-viceroy-${{ env.viceroy_version }}
140+
141+
- run: SKIP_BUILD=1 npm ci
150142

151143
- name: Build WPT runtime
152144
run: |
@@ -231,24 +223,12 @@ jobs:
231223
path: "/home/runner/.cargo/bin/viceroy"
232224
key: crate-cache-viceroy-${{ env.viceroy_version }}
233225

234-
235-
- name: Download x86_64 Linux binaries
226+
- name: Download Engine
236227
uses: actions/download-artifact@v1
237228
with:
238-
name: bins-x86_64-linux
239-
240-
# Move the downloaded binary from the build step into the bins directory in
241-
# the integration-tests directory
242-
- name: Move x86_64 Linux binaries
243-
run: |
244-
arch="x86_64"
245-
platform="linux"
246-
247-
mkdir -p "./target/release"
248-
mv "bins-$arch-$platform/js-compute-runtime" "./target/release/js-compute-runtime"
249-
250-
chmod +x ./target/release/js-compute-runtime
251-
./target/release/js-compute-runtime --help
229+
name: engine-${{ matrix.profile }}
230+
231+
- run: SKIP_BUILD=1 npm ci
252232

253233
- name: js-compute Integration Tests Job
254234
timeout-minutes: 20
@@ -301,6 +281,7 @@ jobs:
301281
steps:
302282
- uses: actions/checkout@v2
303283
- run: SKIP_BUILD=1 npm ci
284+
shell: bash
304285
- run: npm run test:types
305286

306287
e2e-async-select:

0 commit comments

Comments
 (0)