Skip to content

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

Shrink job names on CI (#11859)

Alex Crichtonf7f9176e3f27
diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js
index f355678c3a..3ccf42ea0d 100644
--- a/ci/build-test-matrix.js
+++ b/ci/build-test-matrix.js
@@ -23,8 +23,8 @@ const macos = 'macos-15';
// the merge queue. Same schema as `FULL_MATRIX`.
const FAST_MATRIX = [
{
- "os": ubuntu,
"name": "Test Linux x86_64",
+ "os": ubuntu,
"filter": "linux-x64",
"isa": "x64",
},
@@ -62,67 +62,67 @@ const FAST_MATRIX = [
const FULL_MATRIX = [
...FAST_MATRIX,
{
+ "name": "Test MSRV",
"os": ubuntu,
- "name": "Test MSRV on Linux x86_64",
"filter": "linux-x64",
"isa": "x64",
"rust": "msrv",
},
{
+ "name": "Test MPK",
"os": ubuntu,
- "name": "Test Linux x86_64 with MPK",
"filter": "linux-x64",
"isa": "x64"
},
{
+ "name": "Test ASAN",
"os": ubuntu,
- "name": "Test Linux x86_64 with ASAN",
"filter": "asan",
"rust": "wasmtime-ci-pinned-nightly",
"target": "x86_64-unknown-linux-gnu",
},
{
+ "name": "Test Intel SDE",
"os": ubuntu,
- "name": "Test Linux x86_64 with SDE",
"filter": "sde",
"isa": "x64",
"sde": true,
"crates": "cranelift-tools",
},
{
- "os": macos,
"name": "Test macOS x86_64",
+ "os": macos,
"filter": "macos-x64",
"target": "x86_64-apple-darwin",
},
{
- "os": macos,
"name": "Test macOS arm64",
+ "os": macos,
"filter": "macos-arm64",
"target": "aarch64-apple-darwin",
},
{
+ "name": "Test MSVC x86_64",
"os": windows,
- "name": "Test Windows MSVC x86_64",
"filter": "windows-x64",
},
{
+ "name": "Test MinGW x86_64",
"os": windows,
"target": "x86_64-pc-windows-gnu",
- "name": "Test Windows MinGW x86_64",
"filter": "mingw-x64"
},
{
+ "name": "Test Linux arm64",
"os": ubuntu + '-arm',
"target": "aarch64-unknown-linux-gnu",
- "name": "Test Linux arm64",
"filter": "linux-arm64",
"isa": "aarch64",
},
{
+ "name": "Test Linux s390x",
"os": ubuntu,
"target": "s390x-unknown-linux-gnu",
- "name": "Test Linux s390x",
"filter": "linux-s390x",
"isa": "s390x",
"gcc_package": "gcc-s390x-linux-gnu",
@@ -131,25 +131,25 @@ const FULL_MATRIX = [
"qemu_target": "s390x-linux-user",
},
{
+ "name": "Test Linux riscv64",
"os": ubuntu,
"target": "riscv64gc-unknown-linux-gnu",
"gcc_package": "gcc-riscv64-linux-gnu",
"gcc": "riscv64-linux-gnu-gcc",
"qemu": "qemu-riscv64 -cpu rv64,v=true,vlen=256,vext_spec=v1.0,zfa=true,zfh=true,zba=true,zbb=true,zbc=true,zbs=true,zbkb=true,zcb=true,zicond=true,zvfh=true -L /usr/riscv64-linux-gnu",
"qemu_target": "riscv64-linux-user",
- "name": "Test Linux riscv64",
"filter": "linux-riscv64",
"isa": "riscv64",
},
{
- "name": "Tests on i686-unknown-linux-gnu",
+ "name": "Tests Linux i686",
"os": ubuntu,
"target": "i686-unknown-linux-gnu",
"gcc_package": "gcc-i686-linux-gnu",
"gcc": "i686-linux-gnu-gcc",
},
{
- "name": "Tests on armv7-unknown-linux-gnueabihf",
+ "name": "Tests Linux armv7",
"os": ubuntu,
"target": "armv7-unknown-linux-gnueabihf",
"gcc_package": "gcc-arm-linux-gnueabihf",
@@ -234,24 +234,30 @@ async function shard(configs) {
const sharded = [];
for (const config of configs) {
// If crates is specified, don't shard, just use the specified crates
- if (config.crates) {
- sharded.push(Object.assign(
- {},
- config,
- {
- bucket: members
- .map(c => c === config.crates ? `--package ${c}` : `--exclude ${c}`)
- .join(" ")
- }
- ));
+ if (config.crates) {
+ sharded.push(Object.assign(
+ {},
+ config,
+ {
+ bucket: members
+ .map(c => c === config.crates ? `--package ${c}` : `--exclude ${c}`)
+ .join(" ")
+ }
+ ));
continue;
}
+
+ let nbucket = 1;
for (const bucket of buckets) {
+ let bucket_name = `${nbucket}/${buckets.length}`;
+ if (bucket.size === 1)
+ bucket_name = Array.from(bucket)[0];
+
sharded.push(Object.assign(
{},
config,
{
- name: `${config.name} (${Array.from(bucket).join(', ')})`,
+ name: `${config.name} (${bucket_name})`,
// We run tests via `cargo test --workspace`, so exclude crates that
// aren't in this bucket, rather than naming only the crates that are
// in this bucket.
@@ -260,6 +266,7 @@ async function shard(configs) {
.join(" "),
}
));
+ nbucket += 1;
}
}
return sharded;