File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -70,11 +70,11 @@ RUN \
70
70
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs/ | sh -s -- --no-modify-path --profile minimal --default-toolchain $RUST_VERSION -y && \
71
71
rustup component add rustfmt && \
72
72
rustup component add clippy && \
73
- rustup component add llvm-tools-preview && \
74
73
rustup install $RUST_NIGHTLY_VERSION && \
75
74
rustup component add clippy --toolchain=$RUST_NIGHTLY_VERSION && \
76
75
rustup component add rustfmt --toolchain=$RUST_NIGHTLY_VERSION && \
77
76
rustup component add miri --toolchain=$RUST_NIGHTLY_VERSION && \
77
+ rustup component add llvm-tools-preview --toolchain=$RUST_NIGHTLY_VERSION && \
78
78
rustup target add wasm32-unknown-unknown && \
79
79
cargo install cargo-audit && \
80
80
cargo install cargo-hack && \
Original file line number Diff line number Diff line change 28
28
# shellcheck source=ci/rust-version.sh
29
29
source " $here /../ci/rust-version.sh" nightly
30
30
31
+ # Check llvm path
32
+ llvm_profdata=" $( find " $( rustc +" $rust_nightly " --print sysroot) " -name llvm-profdata) "
33
+ if [ -z " $llvm_profdata " ]; then
34
+ echo " Error: couldn't find llvm-profdata. Try installing the llvm-tools component with \` rustup component add llvm-tools-preview --toolchain=$rust_nightly \` "
35
+ exit 1
36
+ fi
37
+ llvm_path=" $( dirname " $llvm_profdata " ) "
38
+
31
39
# get commit hash. it will be used to name output folder
32
40
if [ -z " $COMMIT_HASH " ]; then
33
41
COMMIT_HASH=$( git rev-parse --short=9 HEAD)
@@ -66,6 +74,7 @@ grcov_common_args=(
66
74
--source-dir " $here /.."
67
75
--binary-path " $here /../target/cov/debug"
68
76
--llvm
77
+ --llvm-path " $llvm_path "
69
78
--ignore \* .cargo\*
70
79
--ignore \* build.rs
71
80
--ignore bench-tps\*
You can’t perform that action at this time.
0 commit comments