File tree 4 files changed +53
-2
lines changed
4 files changed +53
-2
lines changed Original file line number Diff line number Diff line change @@ -41,16 +41,24 @@ jobs:
41
41
TOOLSTATE_REPO : " https://github.com/rust-lang-nursery/rust-toolstate"
42
42
CACHE_DOMAIN : ci-caches.rust-lang.org
43
43
if : " github.event_name == 'pull_request'"
44
+ continue-on-error : " ${{ matrix.tidy }}"
44
45
strategy :
45
46
matrix :
46
47
include :
47
48
- name : mingw-check
49
+ tidy : false
50
+ os : ubuntu-20.04-xl
51
+ env : {}
52
+ - name : mingw-check-tidy
53
+ tidy : true
48
54
os : ubuntu-20.04-xl
49
55
env : {}
50
56
- name : x86_64-gnu-llvm-13
57
+ tidy : false
51
58
os : ubuntu-20.04-xl
52
59
env : {}
53
60
- name : x86_64-gnu-tools
61
+ tidy : false
54
62
env :
55
63
CI_ONLY_WHEN_SUBMODULES_CHANGED : 1
56
64
os : ubuntu-20.04-xl
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change @@ -40,7 +40,6 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
40
40
41
41
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
42
42
ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
43
- python3 ../x.py test --stage 0 src/tools/tidy && \
44
43
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu --all-targets && \
45
44
python3 ../x.py build --stage 0 src/tools/build-manifest && \
46
45
python3 ../x.py test --stage 0 src/tools/compiletest && \
Original file line number Diff line number Diff line change @@ -287,19 +287,27 @@ jobs:
287
287
env :
288
288
<< : [*shared-ci-variables, *public-variables]
289
289
if : github.event_name == 'pull_request'
290
+ continue-on-error : ${{ matrix.tidy }}
290
291
strategy :
291
292
matrix :
292
293
include :
293
294
- name : mingw-check
294
295
<< : *job-linux-xl
296
+ tidy : false
297
+
298
+ - name : mingw-check-tidy
299
+ << : *job-linux-xl
300
+ tidy : true
295
301
296
302
- name : x86_64-gnu-llvm-13
297
303
<< : *job-linux-xl
304
+ tidy : false
298
305
299
306
- name : x86_64-gnu-tools
307
+ << : *job-linux-xl
308
+ tidy : false
300
309
env :
301
310
CI_ONLY_WHEN_SUBMODULES_CHANGED : 1
302
- << : *job-linux-xl
303
311
304
312
auto :
305
313
permissions :
You can’t perform that action at this time.
0 commit comments