Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Switch back to emulation of s390x tests (#12491)

Alex Crichton621d7ebb8faa
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fce65d5608..da2330fec5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -510,7 +510,7 @@ jobs:
- name: Install wkg
run: |
curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
- cargo binstall --no-confirm wkg
+ cargo binstall --no-confirm [email protected]
- name: Re-vendor WIT
run: ./ci/vendor-wit.sh
- run: git diff --exit-code
diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js
index 98788a0699..4869be377d 100644
--- a/ci/build-test-matrix.js
+++ b/ci/build-test-matrix.js
@@ -121,18 +121,15 @@ const FULL_MATRIX = [
},
{
"name": "Test Linux s390x",
- "os": 'ubuntu-24.04-s390x',
+ // "os": 'ubuntu-24.04-s390x',
+ "os": ubuntu,
"target": "s390x-unknown-linux-gnu",
"filter": "linux-s390x",
"isa": "s390x",
- // These are no longer necessary now that this runner is using an
- // IBM-provided native runner. If that needs to change, however,
- // uncommenting these and switching back to `ubuntu` for the os will switch
- // us back to QEMU emulation.
- // "gcc_package": "gcc-s390x-linux-gnu",
- // "gcc": "s390x-linux-gnu-gcc",
- // "qemu": "qemu-s390x -L /usr/s390x-linux-gnu",
- // "qemu_target": "s390x-linux-user",
+ "gcc_package": "gcc-s390x-linux-gnu",
+ "gcc": "s390x-linux-gnu-gcc",
+ "qemu": "qemu-s390x -L /usr/s390x-linux-gnu",
+ "qemu_target": "s390x-linux-user",
},
{
"name": "Test Linux riscv64",