Use LLVM 14 in CI/CD for coverage.

Author: briansmith

.github/workflows/ci.yml

@@ -499,10 +499,7 @@ jobs:
 
         # Coverage collection is Nightly-only
         rust_channel:
-          # XXX: Later Rust Nightly uses LLVM 13 which has a new coverage format.
-          # Use this older version until install-build-tools.sh and similar can
-          # be updated to use LLVM 13.
-          - nightly-2021-08-20
+          - nightly
 
         # TODO: targets
         include:

mk/cargo.sh

@@ -39,7 +39,7 @@ for arg in $*; do
 done
 
 # See comments in install-build-tools.sh.
-llvm_version=12
+llvm_version=14
 
 case $target in
    aarch64-linux-android)

mk/install-build-tools.sh

@@ -76,9 +76,9 @@ case $target in
 esac
 
 if [ -n "$use_clang" ]; then
-  # https://github.com/rust-lang/rust/pull/79365 upgraded the coverage file
-  # format to one that only LLVM 11+ can use
-  llvm_version=12
+  # https://github.com/rustls/rustls/pull/1009 upgraded Rust's LLVM version to
+  # 14
+  llvm_version=14
   sudo apt-key add mk/llvm-snapshot.gpg.key
   sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$llvm_version main"
   sudo apt-get update