Skip to content

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

Move back to emulation of s390x in CI (#11858)

Alex Crichtonfd8e0b4fbc8c
diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js
index 8a02062c8a..f355678c3a 100644
--- a/ci/build-test-matrix.js
+++ b/ci/build-test-matrix.js
@@ -120,19 +120,15 @@ const FULL_MATRIX = [
"isa": "aarch64",
},
{
- "os": 'ubuntu-24.04-s390x',
+ "os": ubuntu,
"target": "s390x-unknown-linux-gnu",
"name": "Test Linux s390x",
"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",
+ "isa": "s390x",
+ "gcc_package": "gcc-s390x-linux-gnu",
+ "gcc": "s390x-linux-gnu-gcc",
+ "qemu": "qemu-s390x -L /usr/s390x-linux-gnu",
+ "qemu_target": "s390x-linux-user",
},
{
"os": ubuntu,