From 67283cc6e91c851e6a418a4b274e608e84a07131 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 22 Jan 2025 14:43:40 -0600
Subject: [PATCH] Update wasm-component-ld (#506)

* Update wasm-component-ld

Pulls in a fix for bytecodealliance/wasmtime#10058 in the adapters that
are used by default.

* Update wasmtime installed in CI

* 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.

* Try downgrading Wasmtime version again

* Update base Linux images to Ubuntu 20.04

* Update Wasmtime back to 29
---
 .github/actions/install-deps/action.yml | 2 +-
 .github/workflows/main.yml              | 2 +-
 ci/docker/Dockerfile.common             | 4 ++--
 cmake/wasi-sdk-toolchain.cmake          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/install-deps/action.yml b/.github/actions/install-deps/action.yml
index 2a75b41..8b81d56 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 a10759f..520856a 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 480e9b7..96013b7 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 cba9c63..646e113 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()