From 1b33c748c3239737c5aeee9caf0b10fdcb2fc6b1 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Fri, 19 Jul 2024 03:36:03 -0400 Subject: [PATCH 1/3] Add `ubuntu-24.04` target --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4a779fd3d..9b2157552 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: ${{ github.event_name == 'merge_group' }} matrix: - environment: [ubuntu-latest, macos-latest] + environment: [ubuntu-latest, ubuntu-24.04, macos-latest] toolchain: [stable, nightly] plugins: [true, false] cc: [cc, clang] From cbdc2d15a3439691ae50fde802c2a3a8a379c63a Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Fri, 19 Jul 2024 03:01:55 -0400 Subject: [PATCH 2/3] Add `all` to `llvm.sh` invocation --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9b2157552..33f026652 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -64,7 +64,8 @@ jobs: else wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh "$LLVM_VERSION" + # smoelius: Re use of `all`, see: https://github.com/llvm/llvm-project/issues/99502 + sudo ./llvm.sh "$LLVM_VERSION" all fi env: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 From 7b2dbc6c8840f45892074c3c23305ca75a6eb343 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Fri, 19 Jul 2024 03:53:42 -0400 Subject: [PATCH 3/3] Try removing `llvm-18` --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 33f026652..1b6439ad6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -65,6 +65,7 @@ jobs: wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh # smoelius: Re use of `all`, see: https://github.com/llvm/llvm-project/issues/99502 + sudo apt remove llvm-"$LLVM_VERSION" sudo ./llvm.sh "$LLVM_VERSION" all fi env: