Skip to content

Commit

Permalink
CI: Use LLVM/Clang 18.
Browse files Browse the repository at this point in the history
Rust updated to LLVM 18. Use Clang 18 as the C compiler so that the
coverage info for C is compatible with that for Rust.
  • Loading branch information
briansmith committed Feb 18, 2024
1 parent fa98b49 commit 4f3d6e9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -530,10 +530,8 @@ jobs:
- # debug

# Coverage collection is Nightly-only
# XXX: Starting with nightly-2024-02-14 there is a segfault when
# running the tests.
rust_channel:
- nightly-2024-02-13
- nightly

# TODO: targets
include:
Expand Down
2 changes: 1 addition & 1 deletion mk/cargo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ for arg in $*; do
done

# See comments in install-build-tools.sh.
llvm_version=16
llvm_version=18

case $target in
aarch64-linux-android)
Expand Down
2 changes: 1 addition & 1 deletion mk/install-build-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ esac
case "$OSTYPE" in
linux*)
ubuntu_codename=$(lsb_release --codename --short)
llvm_version=16
llvm_version=18
sudo apt-key add mk/llvm-snapshot.gpg.key
sudo add-apt-repository "deb http://apt.llvm.org/$ubuntu_codename/ llvm-toolchain-$ubuntu_codename-$llvm_version main"
sudo apt-get update
Expand Down

0 comments on commit 4f3d6e9

Please sign in to comment.