Skip to content

Commit

Permalink
Auto merge of #99529 - Milo123459:stage-1-test, r=jyn514
Browse files Browse the repository at this point in the history
Run `x test --stage 1` in CI

Fixes #99135

r? `@jyn514`
  • Loading branch information
bors committed Jul 31, 2022
2 parents a231865 + 1f7b655 commit 482153b
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,10 @@ jobs:
env:
RUST_BACKTRACE: 1
os: ubuntu-20.04-xl
- name: x86_64-gnu-llvm-12-stage1
env:
RUST_BACKTRACE: 1
os: ubuntu-20.04-xl
- name: x86_64-gnu-nopt
os: ubuntu-20.04-xl
env: {}
Expand Down
44 changes: 44 additions & 0 deletions src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
FROM ubuntu:20.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 \
python2.7 \
git \
cmake \
sudo \
gdb \
llvm-12-tools \
llvm-12-dev \
libedit-dev \
libssl-dev \
pkg-config \
zlib1g-dev \
xz-utils \
nodejs

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

# 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-12 \
--enable-llvm-link-shared \
--set rust.thin-lto-import-instr-limit=10

ENV SCRIPT python2.7 ../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.
python2.7 ../x.py --stage 1 test src/test/mir-opt \
--host='' --target=i686-unknown-linux-gnu
7 changes: 6 additions & 1 deletion src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ jobs:

- name: x86_64-gnu-llvm-12
<<: *job-linux-xl

- name: x86_64-gnu-tools
env:
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
Expand Down Expand Up @@ -436,6 +436,11 @@ jobs:
RUST_BACKTRACE: 1
<<: *job-linux-xl

- name: x86_64-gnu-llvm-12-stage1
env:
RUST_BACKTRACE: 1
<<: *job-linux-xl

- name: x86_64-gnu-nopt
<<: *job-linux-xl

Expand Down

0 comments on commit 482153b

Please sign in to comment.