diff options
| author | Matt Mastracci <matthew@mastracci.com> | 2024-04-12 09:10:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 15:10:07 +0000 |
| commit | 4b62cb54dd135dce494dfe9ddadb87143caf8aa4 (patch) | |
| tree | 65147e62a185cc1758ce09959216cca339422c75 /.github/workflows/ci.yml | |
| parent | 84e198f0d0285077c228a2ea41e927103ec4119f (diff) | |
chore: fix nightly builds (#23328)
- Bump `curve25519-dalek` to fix unstable features
- Bump to llvm-17 to match latest minimum
- cargo update to fix all the things that break w/llvm-17
Diffstat (limited to '.github/workflows/ci.yml')
| -rw-r--r-- | .github/workflows/ci.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 155aa0a8d..5dc6883d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -255,17 +255,17 @@ jobs: # to complete. sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null # Remove older clang before we install - sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' > /dev/null 2> /dev/null + sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' > /dev/null 2> /dev/null # Install clang-XXX, lld-XXX, and debootstrap. - echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | - sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-16.list + echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" | + sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-17.list curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/llvm-snapshot.gpg sudo apt-get update # this was unreliable sometimes, so try again if it fails - sudo apt-get install --no-install-recommends debootstrap clang-16 lld-16 clang-tools-16 clang-format-16 clang-tidy-16 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends debootstrap clang-16 lld-16 clang-tools-16 clang-format-16 clang-tidy-16 + sudo apt-get install --no-install-recommends clang-17 lld-17 clang-tools-17 clang-format-17 clang-tidy-17 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends clang-17 lld-17 clang-tools-17 clang-format-17 clang-tidy-17 # Fix alternatives (yes '' | sudo update-alternatives --force --all) > /dev/null 2> /dev/null || true @@ -300,8 +300,8 @@ jobs: CARGO_PROFILE_RELEASE_LTO=false RUSTFLAGS<<__1 -C linker-plugin-lto=true - -C linker=clang-16 - -C link-arg=-fuse-ld=lld-16 + -C linker=clang-17 + -C link-arg=-fuse-ld=lld-17 -C link-arg=--sysroot=/sysroot -C link-arg=-ldl -C link-arg=-Wl,--allow-shlib-undefined @@ -312,8 +312,8 @@ jobs: __1 RUSTDOCFLAGS<<__1 -C linker-plugin-lto=true - -C linker=clang-16 - -C link-arg=-fuse-ld=lld-16 + -C linker=clang-17 + -C link-arg=-fuse-ld=lld-17 -C link-arg=--sysroot=/sysroot -C link-arg=-ldl -C link-arg=-Wl,--allow-shlib-undefined @@ -321,7 +321,7 @@ jobs: -C link-arg=-Wl,--thinlto-cache-policy,cache_size_bytes=700m ${{ env.RUSTFLAGS }} __1 - CC=clang-16 + CC=/usr/bin/clang-17 CFLAGS=-flto=thin --sysroot=/sysroot __0 - name: Remove macOS cURL --ipv4 flag |
