Skip to content

Commit 84afa72

Browse files
committed
Auto merge of #153726 - Kobzol:parallel-frontend-tests-optional, r=<try>
Add optional CI job to run tests with the parallel frontend try-job: x86_64-gnu-parallel-frontend
2 parents 3b1b0ef + 3a48d69 commit 84afa72

3 files changed

Lines changed: 40 additions & 10 deletions

File tree

src/ci/citool/src/jobs.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -200,16 +200,6 @@ fn validate_job_database(db: &JobDatabase) -> anyhow::Result<()> {
200200
equivalent_modulo_carve_out(pr_job, auto_job)?;
201201
}
202202

203-
// Auto CI jobs must all "fail-fast" to avoid wasting Auto CI resources. For instance, `tidy`.
204-
for auto_job in &db.auto_jobs {
205-
if auto_job.continue_on_error == Some(true) {
206-
return Err(anyhow!(
207-
"Auto job `{}` cannot have `continue_on_error: true`",
208-
auto_job.name
209-
));
210-
}
211-
}
212-
213203
Ok(())
214204
}
215205

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
FROM ubuntu:22.04
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
g++ \
6+
make \
7+
ninja-build \
8+
file \
9+
curl \
10+
ca-certificates \
11+
python3 \
12+
git \
13+
cmake \
14+
sudo \
15+
gdb \
16+
libssl-dev \
17+
pkg-config \
18+
xz-utils \
19+
mingw-w64 \
20+
zlib1g-dev \
21+
libzstd-dev \
22+
&& rm -rf /var/lib/apt/lists/*
23+
24+
COPY scripts/sccache.sh /scripts/
25+
RUN sh /scripts/sccache.sh
26+
27+
ENV RUST_CONFIGURE_ARGS \
28+
--build=x86_64-unknown-linux-gnu \
29+
--enable-sanitizers \
30+
--enable-profiler \
31+
--enable-compiler-docs \
32+
--set llvm.libzstd=true
33+
34+
# Run the test suite with 2 parallel frontend threads
35+
ENV SCRIPT python3 ../x.py --stage 2 test --set rust.parallel-frontend-threads=2

src/ci/github-actions/jobs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,11 @@ auto:
348348
- name: x86_64-gnu
349349
<<: *job-linux-4c
350350

351+
- name: x86_64-gnu-parallel-frontend
352+
# This test can be flaky, so do not cancel CI if it fails, for now.
353+
continue_on_error: true
354+
<<: *job-linux-4c
355+
351356
- name: x86_64-gnu-gcc
352357
doc_url: https://rustc-dev-guide.rust-lang.org/tests/codegen-backend-tests/cg_gcc.html
353358
<<: *job-linux-4c

0 commit comments

Comments
 (0)