From c554b42b2ad97a535ff97be3e78e181187ed336b Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Sun, 29 Mar 2020 15:15:59 +0100 Subject: [PATCH] Fix CI (#845) * Use ubuntu 18.04 instead of 18.10 for MIPS CI * Fix WASM CI --- .../stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile | 2 +- library/stdarch/crates/stdarch-test/src/wasm.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile b/library/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile index 7488662ef281..5d19d7c93d0a 100644 --- a/library/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile +++ b/library/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.10 +FROM ubuntu:18.04 RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/library/stdarch/crates/stdarch-test/src/wasm.rs b/library/stdarch/crates/stdarch-test/src/wasm.rs index fc4ced6282c8..612ff10d90b4 100644 --- a/library/stdarch/crates/stdarch-test/src/wasm.rs +++ b/library/stdarch/crates/stdarch-test/src/wasm.rs @@ -32,8 +32,8 @@ pub(crate) fn disassemble_myself() -> HashSet { // "wasm-bindgen-test_bg". When running in node this is actually a shim JS // file. Ask node where that JS file is, and then we use that with a wasm // extension to find the wasm file itself. - let js_shim = resolve("wasm-bindgen-test_bg"); - let js_shim = Path::new(&js_shim).with_extension("wasm"); + let js_shim = resolve("wasm-bindgen-test"); + let js_shim = Path::new(&js_shim).with_file_name("wasm-bindgen-test_bg.wasm"); // Execute `wasm2wat` synchronously, waiting for and capturing all of its // output. Note that we pass in a custom `maxBuffer` parameter because we're