diff --git a/Cargo.lock b/Cargo.lock index 51985b4..d851baa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3365,7 +3365,7 @@ dependencies = [ [[package]] name = "xtask-base" version = "0.1.0" -source = "git+https://github.com/simon-bourne/rust-xtask-base#0bdc4e42bd4549e63a62dd9a70248e3054f30bde" +source = "git+https://github.com/simon-bourne/rust-xtask-base#c22ff67be9ecab2e0c3a4117d5c061db458e0c45" dependencies = [ "cargo_metadata", "chrono", diff --git a/packages/xtask/src/main.rs b/packages/xtask/src/main.rs index 77ed2bb..216b59e 100644 --- a/packages/xtask/src/main.rs +++ b/packages/xtask/src/main.rs @@ -12,24 +12,19 @@ fn main() { fn ci() -> CI { let mut workflow = CI::new(); + let stable_rustc = || rust_toolchain("1.73").minimal().default().wasm(); + let wasm_pack = || install("wasm-pack", "0.12.1"); + for platform in Platform::latest() { workflow.add_job( - Tasks::new( - "tests", - platform, - rust_toolchain("1.73").minimal().default().clippy().wasm(), - ) - .step(install("wasm-pack", "0.12.1")) - .tests(), + Tasks::new("tests", platform, stable_rustc().clippy()) + .setup(wasm_pack()) + .tests(), ); workflow.add_job( - Tasks::new( - "release-tests", - platform, - rust_toolchain("1.73").minimal().default().wasm(), - ) - .step(install("wasm-pack", "0.12.1")) - .release_tests(), + Tasks::new("release-tests", platform, stable_rustc()) + .setup(wasm_pack()) + .release_tests(), ); }