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' 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: 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 \ 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()