Skip to content

Commit 482153b

Browse files
committed
Auto merge of #99529 - Milo123459:stage-1-test, r=jyn514
Run `x test --stage 1` in CI Fixes #99135 r? `@jyn514`
2 parents a231865 + 1f7b655 commit 482153b

File tree

3 files changed

+54
-1
lines changed

3 files changed

+54
-1
lines changed

.github/workflows/ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@ jobs:
278278
env:
279279
RUST_BACKTRACE: 1
280280
os: ubuntu-20.04-xl
281+
- name: x86_64-gnu-llvm-12-stage1
282+
env:
283+
RUST_BACKTRACE: 1
284+
os: ubuntu-20.04-xl
281285
- name: x86_64-gnu-nopt
282286
os: ubuntu-20.04-xl
283287
env: {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM ubuntu:20.04
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
g++ \
6+
gcc-multilib \
7+
make \
8+
ninja-build \
9+
file \
10+
curl \
11+
ca-certificates \
12+
python2.7 \
13+
git \
14+
cmake \
15+
sudo \
16+
gdb \
17+
llvm-12-tools \
18+
llvm-12-dev \
19+
libedit-dev \
20+
libssl-dev \
21+
pkg-config \
22+
zlib1g-dev \
23+
xz-utils \
24+
nodejs
25+
26+
COPY scripts/sccache.sh /scripts/
27+
RUN sh /scripts/sccache.sh
28+
29+
# using llvm-link-shared due to libffi issues -- see #34486
30+
ENV RUST_CONFIGURE_ARGS \
31+
--build=x86_64-unknown-linux-gnu \
32+
--llvm-root=/usr/lib/llvm-12 \
33+
--enable-llvm-link-shared \
34+
--set rust.thin-lto-import-instr-limit=10
35+
36+
ENV SCRIPT python2.7 ../x.py --stage 1 test --exclude src/tools/tidy && \
37+
# Run the `mir-opt` tests again but this time for a 32-bit target.
38+
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
39+
# both 32-bit and 64-bit outputs updated by the PR author, before
40+
# the PR is approved and tested for merging.
41+
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
42+
# despite having different output on 32-bit vs 64-bit targets.
43+
python2.7 ../x.py --stage 1 test src/test/mir-opt \
44+
--host='' --target=i686-unknown-linux-gnu

src/ci/github-actions/ci.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ jobs:
286286

287287
- name: x86_64-gnu-llvm-12
288288
<<: *job-linux-xl
289-
289+
290290
- name: x86_64-gnu-tools
291291
env:
292292
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
@@ -436,6 +436,11 @@ jobs:
436436
RUST_BACKTRACE: 1
437437
<<: *job-linux-xl
438438

439+
- name: x86_64-gnu-llvm-12-stage1
440+
env:
441+
RUST_BACKTRACE: 1
442+
<<: *job-linux-xl
443+
439444
- name: x86_64-gnu-nopt
440445
<<: *job-linux-xl
441446

0 commit comments

Comments
 (0)