.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.
reviewable/pr1363/r4
Tamir Duberstein 1 week ago
parent 71f6176e24
commit d82ed60795
No known key found for this signature in database

@ -10,6 +10,9 @@ linker = "arm-linux-gnueabihf-gcc"
[target.aarch64-unknown-linux-musl] [target.aarch64-unknown-linux-musl]
linker = "aarch64-linux-musl-gcc" linker = "aarch64-linux-musl-gcc"
[target.x86_64-unknown-linux-musl]
linker = "x86_64-linux-musl-gcc"
[target.powerpc64le-unknown-linux-gnu] [target.powerpc64le-unknown-linux-gnu]
linker = "powerpc64le-linux-gnu-gcc" linker = "powerpc64le-linux-gnu-gcc"

@ -215,9 +215,9 @@ jobs:
# We don't use ubuntu-latest because we care about the apt packages available. # We don't use ubuntu-latest because we care about the apt packages available.
- target: x86_64-unknown-linux-gnu - target: x86_64-unknown-linux-gnu
os: ubuntu-22.04 os: ubuntu-24.04
- target: aarch64-unknown-linux-gnu - target: aarch64-unknown-linux-gnu
os: ubuntu-22.04-arm os: ubuntu-24.04-arm
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
@ -226,17 +226,14 @@ jobs:
- name: Install prerequisites - name: Install prerequisites
if: runner.os == 'Linux' 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: | run: |
set -euxo pipefail set -euxo pipefail
sudo apt update sudo apt update
sudo apt -y install lynx qemu-system-{arm,x86} musl-tools sudo apt -y install \
echo /usr/lib/llvm-15/bin >> $GITHUB_PATH liblzma-dev \
lynx \
musl-tools \
qemu-system-{arm,x86}
- name: Install prerequisites - name: Install prerequisites
if: runner.os == 'macOS' if: runner.os == 'macOS'

Loading…
Cancel
Save