CI: merge x86_64-gnu-llvm-14 and x86_64-gnu-llvm-14-stage1 CI jobs
This commit is contained in:
parent
f90d57d06e
commit
1dba9721fc
6 changed files with 40 additions and 80 deletions
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
|
@ -36,6 +36,7 @@ jobs:
|
||||||
actions: write
|
actions: write
|
||||||
name: "PR - ${{ matrix.name }}"
|
name: "PR - ${{ matrix.name }}"
|
||||||
env:
|
env:
|
||||||
|
PR_CI_JOB: 1
|
||||||
CI_JOB_NAME: "${{ matrix.name }}"
|
CI_JOB_NAME: "${{ matrix.name }}"
|
||||||
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
|
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
|
||||||
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
|
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
|
||||||
|
@ -314,10 +315,6 @@ jobs:
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
os: ubuntu-20.04-8core-32gb
|
os: ubuntu-20.04-8core-32gb
|
||||||
- name: x86_64-gnu-llvm-14-stage1
|
|
||||||
env:
|
|
||||||
RUST_BACKTRACE: 1
|
|
||||||
os: ubuntu-20.04-8core-32gb
|
|
||||||
- name: x86_64-gnu-nopt
|
- name: x86_64-gnu-nopt
|
||||||
os: ubuntu-20.04-4core-16gb
|
os: ubuntu-20.04-4core-16gb
|
||||||
env: {}
|
env: {}
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
FROM ubuntu:22.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-14-tools \
|
|
||||||
llvm-14-dev \
|
|
||||||
libedit-dev \
|
|
||||||
libssl-dev \
|
|
||||||
pkg-config \
|
|
||||||
zlib1g-dev \
|
|
||||||
xz-utils \
|
|
||||||
nodejs \
|
|
||||||
mingw-w64 \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
# This is not the latest LLVM version, so some components required by tests may
|
|
||||||
# be missing.
|
|
||||||
ENV IS_NOT_LATEST_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-14 \
|
|
||||||
--enable-llvm-link-shared \
|
|
||||||
--set rust.thin-lto-import-instr-limit=10
|
|
||||||
|
|
||||||
ENV SCRIPT ../x.py --stage 1 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.py --stage 1 test tests/mir-opt \
|
|
||||||
--host='' --target=i686-unknown-linux-gnu
|
|
|
@ -49,20 +49,6 @@ ENV RUST_CONFIGURE_ARGS \
|
||||||
--enable-llvm-link-shared \
|
--enable-llvm-link-shared \
|
||||||
--set rust.thin-lto-import-instr-limit=10
|
--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.
|
COPY host-x86_64/x86_64-gnu-llvm-14/script.sh /tmp/
|
||||||
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.
|
ENV SCRIPT /tmp/script.sh
|
||||||
# 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
|
|
||||||
|
|
34
src/ci/docker/host-x86_64/x86_64-gnu-llvm-14/script.sh
Executable file
34
src/ci/docker/host-x86_64/x86_64-gnu-llvm-14/script.sh
Executable file
|
@ -0,0 +1,34 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Only run the stage 1 tests on merges, not on PR CI jobs.
|
||||||
|
if [[ -z "${PR_CI_JOB}" ]]; then
|
||||||
|
../x.py --stage 1 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.py --stage 1 test tests/mir-opt \
|
||||||
|
--host='' --target=i686-unknown-linux-gnu
|
||||||
|
fi
|
||||||
|
|
||||||
|
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
|
||||||
|
../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
|
|
@ -265,6 +265,7 @@ docker \
|
||||||
--env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
|
--env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
|
||||||
--env BASE_COMMIT="$BASE_COMMIT" \
|
--env BASE_COMMIT="$BASE_COMMIT" \
|
||||||
--env DIST_TRY_BUILD \
|
--env DIST_TRY_BUILD \
|
||||||
|
--env PR_CI_JOB \
|
||||||
--init \
|
--init \
|
||||||
--rm \
|
--rm \
|
||||||
rust-ci \
|
rust-ci \
|
||||||
|
|
|
@ -313,6 +313,7 @@ jobs:
|
||||||
name: PR - ${{ matrix.name }}
|
name: PR - ${{ matrix.name }}
|
||||||
env:
|
env:
|
||||||
<<: [*shared-ci-variables, *public-variables]
|
<<: [*shared-ci-variables, *public-variables]
|
||||||
|
PR_CI_JOB: 1
|
||||||
if: github.event_name == 'pull_request'
|
if: github.event_name == 'pull_request'
|
||||||
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
|
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
|
||||||
strategy:
|
strategy:
|
||||||
|
@ -489,11 +490,6 @@ jobs:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
<<: *job-linux-8c
|
<<: *job-linux-8c
|
||||||
|
|
||||||
- name: x86_64-gnu-llvm-14-stage1
|
|
||||||
env:
|
|
||||||
RUST_BACKTRACE: 1
|
|
||||||
<<: *job-linux-8c
|
|
||||||
|
|
||||||
- name: x86_64-gnu-nopt
|
- name: x86_64-gnu-nopt
|
||||||
<<: *job-linux-4c
|
<<: *job-linux-4c
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue