-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ci: add a runner for vanilla LLVM 16 #110242
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
FROM ubuntu:23.04 | ||
|
||
ARG DEBIAN_FRONTEND=noninteractive | ||
|
||
RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
g++ \ | ||
gcc-multilib \ | ||
make \ | ||
ninja-build \ | ||
file \ | ||
curl \ | ||
ca-certificates \ | ||
python3 \ | ||
git \ | ||
cmake \ | ||
sudo \ | ||
gdb \ | ||
llvm-16-tools \ | ||
llvm-16-dev \ | ||
libedit-dev \ | ||
libssl-dev \ | ||
pkg-config \ | ||
zlib1g-dev \ | ||
xz-utils \ | ||
nodejs \ | ||
mingw-w64 \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
# Install powershell (universal package) so we can test x.ps1 on Linux | ||
RUN curl -sL "https://github.com/PowerShell/PowerShell/releases/download/v7.3.1/powershell_7.3.1-1.deb_amd64.deb" > powershell.deb && \ | ||
dpkg -i powershell.deb && \ | ||
rm -f powershell.deb | ||
|
||
COPY scripts/sccache.sh /scripts/ | ||
RUN sh /scripts/sccache.sh | ||
|
||
# We are disabling CI LLVM since this builder is intentionally using a host | ||
# LLVM, rather than the typical src/llvm-project LLVM. | ||
ENV NO_DOWNLOAD_CI_LLVM 1 | ||
|
||
# Using llvm-link-shared due to libffi issues -- see #34486 | ||
ENV RUST_CONFIGURE_ARGS \ | ||
--build=x86_64-unknown-linux-gnu \ | ||
--llvm-root=/usr/lib/llvm-16 \ | ||
--enable-llvm-link-shared \ | ||
--set rust.thin-lto-import-instr-limit=10 | ||
|
||
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux. | ||
ENV SCRIPT ../x.py --stage 2 test --exclude src/tools/tidy && \ | ||
# Run the `mir-opt` tests again but this time for a 32-bit target. | ||
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have | ||
# both 32-bit and 64-bit outputs updated by the PR author, before | ||
# the PR is approved and tested for merging. | ||
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`, | ||
# despite having different output on 32-bit vs 64-bit targets. | ||
../x --stage 2 test tests/mir-opt \ | ||
--host='' --target=i686-unknown-linux-gnu && \ | ||
# Run the UI test suite again, but in `--pass=check` mode | ||
# | ||
# This is intended to make sure that both `--pass=check` continues to | ||
# work. | ||
# | ||
../x.ps1 --stage 2 test tests/ui --pass=check \ | ||
--host='' --target=i686-unknown-linux-gnu |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both Dockerfiles have an outdated comment about how they use both Python 2 and 3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, please use python2 in at least one of the test runners.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jyn514
mingw-check-tidy
still uses it -- should be good enough?rust/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile
Line 34 in fef27e0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we block on that in a full bors merge? I was under the impression it only ran on PRs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I suppose that is just a
pr
job. So, I can add something back to llvm-15 if you want, but the new llvm-16 builder is onubuntu:23.04
which doesn't have python2 at all. Or we can find some other builder as the guinea pig, or maybe it's time to soft-retire python2 and stop worrying about it...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's find some other builder to be the guinea pig. I see src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile is using 18.04, would that work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like we're barely testing python2 compat at all, given that
x.py
re-execs when it sees python3 available, but oh well. I've added it todist-x86_64-illumos
as suggested.