Skip to content

Commit f6830a2

Browse files
committed
Auto merge of #110232 - Amanieu:old-llvm-components, r=petrochenkov
Allow older LLVM versions to have missing components This check was introduced by #77280 to ensure that all tests that are filtered by LLVM component are actually tested in CI. However this causes issues for new targets (e.g. #101069) where support is only available on the latest LLVM version. This PR restricts the tests to only CI jobs that use the latest LLVM version.
2 parents fdeef3e + 7e8611b commit f6830a2

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-llvm-14-stage1/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ RUN sh /scripts/sccache.sh
3232
# LLVM, rather than the typical src/llvm-project LLVM.
3333
ENV NO_DOWNLOAD_CI_LLVM 1
3434

35+
# This is not the latest LLVM version, so some components required by tests may
36+
# be missing.
37+
ENV IS_NOT_LATEST_LLVM 1
38+
3539
# Using llvm-link-shared due to libffi issues -- see #34486
3640
ENV RUST_CONFIGURE_ARGS \
3741
--build=x86_64-unknown-linux-gnu \

src/ci/docker/host-x86_64/x86_64-gnu-llvm-14/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN sh /scripts/sccache.sh
3838
# LLVM, rather than the typical src/llvm-project LLVM.
3939
ENV NO_DOWNLOAD_CI_LLVM 1
4040

41+
# This is not the latest LLVM version, so some components required by tests may
42+
# be missing.
43+
ENV IS_NOT_LATEST_LLVM 1
44+
4145
# Using llvm-link-shared due to libffi issues -- see #34486
4246
ENV RUST_CONFIGURE_ARGS \
4347
--build=x86_64-unknown-linux-gnu \

src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN sh /scripts/sccache.sh
3838
# LLVM, rather than the typical src/llvm-project LLVM.
3939
ENV NO_DOWNLOAD_CI_LLVM 1
4040

41+
# This is not the latest LLVM version, so some components required by tests may
42+
# be missing.
43+
ENV IS_NOT_LATEST_LLVM 1
44+
4145
# Using llvm-link-shared due to libffi issues -- see #34486
4246
ENV RUST_CONFIGURE_ARGS \
4347
--build=x86_64-unknown-linux-gnu \

src/ci/run.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,11 @@ if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] || [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]
143143
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-missing-tools"
144144
fi
145145

146-
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
146+
# Unless we're using an older version of LLVM, check that all LLVM components
147+
# used by tests are available.
148+
if [ "$IS_NOT_LATEST_LLVM" = "" ]; then
149+
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
150+
fi
147151

148152
# Print the date from the local machine and the date from an external source to
149153
# check for clock drifts. An HTTP URL is used instead of HTTPS since on Azure

0 commit comments

Comments
 (0)