From 36eef6999db65846cb8007e9369576a4d6f84a0e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 Jan 2025 15:19:34 -0800 Subject: [PATCH 1/6] Update wasm-component-ld Pulls in a fix for bytecodealliance/wasmtime#10058 in the adapters that are used by default. --- cmake/wasi-sdk-toolchain.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/wasi-sdk-toolchain.cmake b/cmake/wasi-sdk-toolchain.cmake index cba9c63ee..646e113b9 100644 --- a/cmake/wasi-sdk-toolchain.cmake +++ b/cmake/wasi-sdk-toolchain.cmake @@ -119,7 +119,7 @@ install(DIRECTORY ${wasi_tmp_install}/bin ${wasi_tmp_install}/lib ${wasi_tmp_ins # Build logic for `wasm-component-ld` installed from Rust code. set(wasm_component_ld_root ${CMAKE_CURRENT_BINARY_DIR}/wasm-component-ld) set(wasm_component_ld ${wasm_component_ld_root}/bin/wasm-component-ld${CMAKE_EXECUTABLE_SUFFIX}) -set(wasm_component_ld_version 0.5.11) +set(wasm_component_ld_version 0.5.12) if(RUST_TARGET) set(rust_target_flag --target=${RUST_TARGET}) endif() From ac842b9168a21c32d1785bffa91f08bb743f9500 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 Jan 2025 15:34:54 -0800 Subject: [PATCH 2/6] Update wasmtime installed in CI --- .github/actions/install-deps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-deps/action.yml b/.github/actions/install-deps/action.yml index 2a75b4118..8b81d5677 100644 --- a/.github/actions/install-deps/action.yml +++ b/.github/actions/install-deps/action.yml @@ -7,7 +7,7 @@ runs: - name: Setup `wasmtime` for tests uses: bytecodealliance/actions/wasmtime/setup@v1 with: - version: "18.0.2" + version: "29.0.1" - name: Install ccache, ninja (macOS) run: brew install ccache ninja if: runner.os == 'macOS' From ce8fc33796b2843c3bf19df6fd7f3ce34e4ec0d0 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 Jan 2025 15:55:14 -0800 Subject: [PATCH 3/6] Downgrade the build-only-sysroot check step Looks like this is failing on Ubuntu 24.04, the new default of `ubuntu-latest`, so downgrade it to have it get fixed in a separate PR. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a10759f88..520856aae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -165,7 +165,7 @@ jobs: build-only-sysroot: name: Build only sysroot - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: From 146fbff1b087c6b490dfd1c359c38dc7ff6566d0 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 22 Jan 2025 08:10:42 -0800 Subject: [PATCH 4/6] Try downgrading Wasmtime version again --- .github/actions/install-deps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-deps/action.yml b/.github/actions/install-deps/action.yml index 8b81d5677..d25f2e35f 100644 --- a/.github/actions/install-deps/action.yml +++ b/.github/actions/install-deps/action.yml @@ -7,7 +7,7 @@ runs: - name: Setup `wasmtime` for tests uses: bytecodealliance/actions/wasmtime/setup@v1 with: - version: "29.0.1" + version: "22.0.1" - name: Install ccache, ninja (macOS) run: brew install ccache ninja if: runner.os == 'macOS' From 888de68421ce5e7b91a1461b42515cafa1bf8ac2 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 22 Jan 2025 09:00:52 -0800 Subject: [PATCH 5/6] Update base Linux images to Ubuntu 20.04 --- ci/docker/Dockerfile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/Dockerfile.common b/ci/docker/Dockerfile.common index 480e9b77d..96013b745 100644 --- a/ci/docker/Dockerfile.common +++ b/ci/docker/Dockerfile.common @@ -1,8 +1,8 @@ # Use a relatively old/stable distro here to maximize the supported platforms # and avoid depending on more recent version of, say, libc. -# Here we choose Bionic 18.04. +# Here we choose Ubuntu 20.04. -FROM ubuntu:18.04 +FROM ubuntu:20.04 # Various build tooling and such necessary to build LLVM and a wasi-sysroot RUN apt-get update \ From 91c8f00154a6eb513acab6e055330df2a2acfa1c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 22 Jan 2025 09:01:59 -0800 Subject: [PATCH 6/6] Update Wasmtime back to 29 --- .github/actions/install-deps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-deps/action.yml b/.github/actions/install-deps/action.yml index d25f2e35f..8b81d5677 100644 --- a/.github/actions/install-deps/action.yml +++ b/.github/actions/install-deps/action.yml @@ -7,7 +7,7 @@ runs: - name: Setup `wasmtime` for tests uses: bytecodealliance/actions/wasmtime/setup@v1 with: - version: "22.0.1" + version: "29.0.1" - name: Install ccache, ninja (macOS) run: brew install ccache ninja if: runner.os == 'macOS'