From d82ed60795aedfe273d64b012d60107645222506 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 7 Oct 2025 09:21:07 -0700
Subject: [PATCH] .cargo/config: use musl-cross on x86_64 as well

This allows us to run virtualized integration tests on macOS hosts.

Bump Ubuntu to 24.04 because we seem to be getting miscompilation on
x86_64 otherwise (when using `x86_64-linux-musl-gcc`). Add `apt install
liblzma-dev` since it doesn't seem to be present in ubuntu-24.04.
---
 .cargo/config.toml       |  3 +++
 .github/workflows/ci.yml | 17 +++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index a21a5f44..0584e1b4 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -10,6 +10,9 @@ linker = "arm-linux-gnueabihf-gcc"
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-musl-gcc"
 
+[target.x86_64-unknown-linux-musl]
+linker = "x86_64-linux-musl-gcc"
+
 [target.powerpc64le-unknown-linux-gnu]
 linker = "powerpc64le-linux-gnu-gcc"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28cc2fe4..a47fc257 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -215,9 +215,9 @@ jobs:
 
           # We don't use ubuntu-latest because we care about the apt packages available.
           - target: x86_64-unknown-linux-gnu
-            os: ubuntu-22.04
+            os: ubuntu-24.04
           - target: aarch64-unknown-linux-gnu
-            os: ubuntu-22.04-arm
+            os: ubuntu-24.04-arm
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
@@ -226,17 +226,14 @@ jobs:
 
       - name: Install prerequisites
         if: runner.os == 'Linux'
-        # ubuntu-22.04 comes with clang 13-15[0]; support for signed and 64bit
-        # enum values was added in clang 15[1] which isn't in `$PATH`.
-        #
-        # [0] https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md
-        #
-        # [1] https://github.com/llvm/llvm-project/commit/dc1c43d
         run: |
           set -euxo pipefail
           sudo apt update
-          sudo apt -y install lynx qemu-system-{arm,x86} musl-tools
-          echo /usr/lib/llvm-15/bin >> $GITHUB_PATH
+          sudo apt -y install \
+            liblzma-dev \
+            lynx \
+            musl-tools \
+            qemu-system-{arm,x86}
 
       - name: Install prerequisites
         if: runner.os == 'macOS'