Skip to content

Commit 328edcc

Browse files
committed
ci: Make the x86_64-gnu-parallel-frontend job non-optional
1 parent 29e68fe commit 328edcc

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

src/ci/docker/host-x86_64/optional-x86_64-gnu-parallel-frontend/Dockerfile renamed to src/ci/docker/host-x86_64/x86_64-gnu-parallel-frontend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ ENV RUST_CONFIGURE_ARGS \
3939
# Tests are still compiled serially at the moment (intended to be changed in follow-ups).
4040
# Running compiletest only tests for parallel frontend, then the rest without compiletest-only
4141
# options (i.e. `--parallel-frontend-threads=4 --iteration-count=2`)
42-
COPY ./scripts/optional-x86_64-gnu-parallel-frontend.sh /scripts/
42+
COPY ./scripts/x86_64-gnu-parallel-frontend.sh /scripts/
4343
ENV SCRIPT="Must specify DOCKER_SCRIPT for this image"

src/ci/docker/scripts/optional-x86_64-gnu-parallel-frontend.sh renamed to src/ci/docker/scripts/x86_64-gnu-parallel-frontend.sh

File renamed without changes.

‎src/ci/github-actions/jobs.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,9 @@ auto:
382382
- name: x86_64-gnu
383383
<<: *job-linux-4c
384384

385-
- name: optional-x86_64-gnu-parallel-frontend
386-
# This test can be flaky, so do not cancel CI if it fails, for now.
387-
continue_on_error: true
385+
- name: x86_64-gnu-parallel-frontend
388386
env:
389-
DOCKER_SCRIPT: optional-x86_64-gnu-parallel-frontend.sh
387+
DOCKER_SCRIPT: x86_64-gnu-parallel-frontend.sh
390388
<<: *job-linux-4c
391389

392390
# This job ensures commits landing on nightly still pass the full

0 commit comments

Comments
 (0)