Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4566db3

Browse files
committedDec 22, 2022
Run tidy in its own job in PR CI
This duplicates mingw-check into two jobs where one job runs `tidy` only while the other job does not. The tidy job will not cancel other jobs on failure.
1 parent 2d8651a commit 4566db3

File tree

4 files changed

+53
-2
lines changed

4 files changed

+53
-2
lines changed
 

‎.github/workflows/ci.yml

+8
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,24 @@ jobs:
4141
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4242
CACHE_DOMAIN: ci-caches.rust-lang.org
4343
if: "github.event_name == 'pull_request'"
44+
continue-on-error: "${{ matrix.tidy }}"
4445
strategy:
4546
matrix:
4647
include:
4748
- name: mingw-check
49+
tidy: false
50+
os: ubuntu-20.04-xl
51+
env: {}
52+
- name: mingw-check-tidy
53+
tidy: true
4854
os: ubuntu-20.04-xl
4955
env: {}
5056
- name: x86_64-gnu-llvm-13
57+
tidy: false
5158
os: ubuntu-20.04-xl
5259
env: {}
5360
- name: x86_64-gnu-tools
61+
tidy: false
5462
env:
5563
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
5664
os: ubuntu-20.04-xl
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
FROM ubuntu:18.04
2+
# FIXME: when bumping the version, remove the Python 3.6-specific changes in
3+
# the reuse-requirements.in file, regenerate reuse-requirements.txt and remove
4+
# this comment.
5+
6+
RUN apt-get update && apt-get install -y --no-install-recommends \
7+
g++ \
8+
make \
9+
ninja-build \
10+
file \
11+
curl \
12+
ca-certificates \
13+
python3 \
14+
python3-pip \
15+
python3-pkg-resources \
16+
git \
17+
cmake \
18+
sudo \
19+
gdb \
20+
xz-utils \
21+
libssl-dev \
22+
pkg-config \
23+
mingw-w64 \
24+
&& rm -rf /var/lib/apt/lists/*
25+
26+
COPY scripts/sccache.sh /scripts/
27+
RUN sh /scripts/sccache.sh
28+
29+
COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
30+
RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt
31+
32+
COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
33+
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
34+
35+
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
36+
ENV SCRIPT python3 ../x.py test --stage 0 src/tools/tidy

‎src/ci/docker/host-x86_64/mingw-check/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
4040

4141
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
4242
ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
43-
python3 ../x.py test --stage 0 src/tools/tidy && \
4443
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu --all-targets && \
4544
python3 ../x.py build --stage 0 src/tools/build-manifest && \
4645
python3 ../x.py test --stage 0 src/tools/compiletest && \

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,27 @@ jobs:
287287
env:
288288
<<: [*shared-ci-variables, *public-variables]
289289
if: github.event_name == 'pull_request'
290+
continue-on-error: ${{ matrix.tidy }}
290291
strategy:
291292
matrix:
292293
include:
293294
- name: mingw-check
294295
<<: *job-linux-xl
296+
tidy: false
297+
298+
- name: mingw-check-tidy
299+
<<: *job-linux-xl
300+
tidy: true
295301

296302
- name: x86_64-gnu-llvm-13
297303
<<: *job-linux-xl
304+
tidy: false
298305

299306
- name: x86_64-gnu-tools
307+
<<: *job-linux-xl
308+
tidy: false
300309
env:
301310
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
302-
<<: *job-linux-xl
303311

304312
auto:
305313
permissions:

0 commit comments

Comments
 (0)
Please sign in to comment.