Skip to content
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.

Sign up for GitHub

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: use free runners for x86_64-gnu-llvm jobs #134124

Merged
merged 21 commits into from
Dec 16, 2024
Merged

CI: use free runners for x86_64-gnu-llvm jobs #134124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
577b5f3
CI: use free runners for x86_64-gnu-llvm jobs
marcoieni Dec 10, 2024
e67e9b4
fix
marcoieni Dec 10, 2024
4f0e781
split better
marcoieni Dec 11, 2024
bb88d7a
fix
marcoieni Dec 11, 2024
84ba41d
remove unnecessary change
marcoieni Dec 11, 2024
abd8352
restore command
marcoieni Dec 11, 2024
a8bc3cf
fix
marcoieni Dec 11, 2024
d74de1f
debug
marcoieni Dec 11, 2024
754fb24
debug
marcoieni Dec 11, 2024
9ed728d
debug
marcoieni Dec 11, 2024
eec9bcf
more debug
marcoieni Dec 11, 2024
fee220a
fix
marcoieni Dec 11, 2024
1f38572
fix
marcoieni Dec 11, 2024
7ce2944
test stage 1 in separate job
marcoieni Dec 12, 2024
aa0fd46
copy script
marcoieni Dec 12, 2024
a1abbaa
remove echo logs
marcoieni Dec 12, 2024
2bf1cec
refactor
marcoieni Dec 12, 2024
c2f4550
remove echo
marcoieni Dec 12, 2024
a67a71d
add files
marcoieni Dec 12, 2024
4fa9078
fix path
marcoieni Dec 12, 2024
ac078a4
fix path
marcoieni Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-llvm-18/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
RUN /scripts/build-gccjit.sh /scripts

COPY scripts/x86_64-gnu-llvm.sh /tmp/script.sh
ENV SCRIPT /tmp/script.sh
ARG SCRIPT_ARG
ENV SCRIPT="/tmp/script.sh && ${SCRIPT_ARG}"
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
RUN /scripts/build-gccjit.sh /scripts

COPY scripts/x86_64-gnu-llvm.sh /tmp/script.sh
ENV SCRIPT /tmp/script.sh
ENV SCRIPT="/tmp/script.sh && ${SCRIPT_ARG}"
3 changes: 0 additions & 3 deletions src/ci/docker/scripts/x86_64-gnu-llvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ if [[ -z "${PR_CI_JOB}" ]]; then
library/std library/alloc library/core
fi

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this because this script only runs in PR

# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
../x.py --stage 2 test --skip 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
Expand Down
34 changes: 30 additions & 4 deletions src/ci/github-actions/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ pr:
ENABLE_GCC_CODEGEN: "1"
# We are adding (temporarily) a dummy commit on the compiler
READ_ONLY_SRC: "0"
DOCKER_SCRIPT: python3 ../x.py --stage 2 test --skip src/tools/tidy
<<: *job-linux-16c
- image: x86_64-gnu-tools
<<: *job-linux-16c
Expand Down Expand Up @@ -312,16 +313,41 @@ auto:
- image: x86_64-gnu-distcheck
<<: *job-linux-8c

- image: x86_64-gnu-llvm-19
# The x86_64-gnu-llvm-19 job is split into multiple jobs to run tests in parallel.
# x86_64-gnu-llvm-19-1 skips tests that run in x86_64-gnu-llvm-19-2.
- image: x86_64-gnu-llvm-19-1
env:
RUST_BACKTRACE: 1
<<: *job-linux-8c
IMAGE: x86_64-gnu-llvm-19
<<: *stage_2_test_set1
<<: *job-linux-4c

- image: x86_64-gnu-llvm-18
# Skip tests that run in x86_64-gnu-llvm-19-2
- image: x86_64-gnu-llvm-19-2
env:
RUST_BACKTRACE: 1
IMAGE: x86_64-gnu-llvm-19
<<: *stage_2_test_set2
<<: *job-linux-4c

# The x86_64-gnu-llvm-18 job is split into multiple jobs to run tests in parallel.
# x86_64-gnu-llvm-18-1 skips tests that run in x86_64-gnu-llvm-18-2.
- image: x86_64-gnu-llvm-18-1
env:
RUST_BACKTRACE: 1
READ_ONLY_SRC: "0"
<<: *job-linux-8c
IMAGE: x86_64-gnu-llvm-18
<<: *stage_2_test_set1
<<: *job-linux-4c

# Skip tests that run in x86_64-gnu-llvm-18-2
- image: x86_64-gnu-llvm-18-2
env:
RUST_BACKTRACE: 1
READ_ONLY_SRC: "0"
IMAGE: x86_64-gnu-llvm-18
<<: *stage_2_test_set2
<<: *job-linux-4c

- image: x86_64-gnu-nopt
<<: *job-linux-4c
Expand Down
Loading