Skip to content

Commit dfb67e7

Browse files
marcoienimarcoieni
committed
split tasks in dockerfile
1 parent 448219e commit dfb67e7

File tree

5 files changed

+92
-53
lines changed

5 files changed

+92
-53
lines changed

src/ci/docker/host-x86_64/i686-gnu/Dockerfile renamed to src/ci/docker/host-x86_64/i686-gnu-1/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ COPY scripts/sccache.sh /scripts/
2424
RUN sh /scripts/sccache.sh
2525

2626
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
27-
# Skip some tests that are unlikely to be platform specific, to speed up
28-
# this slow job.
27+
# We run the other tests in i686-gnu-2
2928
ENV SCRIPT python3 ../x.py --stage 2 test \
30-
--skip src/bootstrap \
31-
--skip tests/rustdoc-js \
32-
--skip src/tools/error_index_generator \
33-
--skip src/tools/linkchecker
29+
tests/ui \
30+
tests/rustdoc \
31+
tests/run-make \
32+
tests/rustdoc-ui \
33+
tests/ui-fulldeps \
34+
tests/rustdoc

‎src/ci/docker/host-x86_64/i686-gnu-2/Dockerfile‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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++-multilib \
6+
make \
7+
ninja-build \
8+
file \
9+
curl \
10+
ca-certificates \
11+
python3 \
12+
git \
13+
cmake \
14+
sudo \
15+
gdb \
16+
zlib1g-dev \
17+
lib32z1-dev \
18+
xz-utils \
19+
mingw-w64 \
20+
&& rm -rf /var/lib/apt/lists/*
21+
22+
23+
COPY scripts/sccache.sh /scripts/
24+
RUN sh /scripts/sccache.sh
25+
26+
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
27+
ENV SCRIPT python3 ../x.py --stage 2 test \
28+
# Skip tests that we run in i686-gnu-1
29+
--skip tests/ui \
30+
--skip tests/rustdoc \
31+
--skip tests/run-make \
32+
--skip tests/rustdoc-ui \
33+
--skip tests/ui-fulldeps \
34+
--skip tests/rustdoc \
35+
# Skip some tests that are unlikely to be platform specific, to speed up
36+
# this slow job.
37+
--skip src/bootstrap \
38+
--skip tests/rustdoc-js \
39+
--skip src/tools/error_index_generator \
40+
--skip src/tools/linkchecker

‎src/ci/docker/host-x86_64/i686-gnu-nopt-1/Dockerfile‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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++-multilib \
6+
make \
7+
ninja-build \
8+
file \
9+
curl \
10+
ca-certificates \
11+
python3 \
12+
git \
13+
cmake \
14+
sudo \
15+
gdb \
16+
zlib1g-dev \
17+
lib32z1-dev \
18+
xz-utils \
19+
&& rm -rf /var/lib/apt/lists/*
20+
21+
22+
COPY scripts/sccache.sh /scripts/
23+
RUN sh /scripts/sccache.sh
24+
25+
RUN mkdir -p /config
26+
RUN echo "[rust]" > /config/nopt-std-config.toml
27+
RUN echo "optimize = false" >> /config/nopt-std-config.toml
28+
29+
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
30+
# We run the other tests in i686-gnu-nopt-2
31+
ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
32+
&& python3 ../x.py --stage 2 test \
33+
tests/ui \
34+
tests/rustdoc \
35+
tests/run-make \
36+
tests/rustdoc-ui \
37+
tests/ui-fulldeps \
38+
tests/rustdoc

src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile renamed to src/ci/docker/host-x86_64/i686-gnu-nopt-2/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,10 @@ RUN echo "optimize = false" >> /config/nopt-std-config.toml
2828

2929
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
3030
ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
31-
&& python3 ../x.py --stage 2 test
31+
&& python3 ../x.py --stage 2 test \
32+
--skip tests/ui \
33+
--skip tests/rustdoc \
34+
--skip tests/run-make \
35+
--skip tests/rustdoc-ui \
36+
--skip tests/ui-fulldeps \
37+
--skip tests/rustdoc

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

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -213,61 +213,15 @@ auto:
213213
<<: *job-linux-4c
214214

215215
- image: i686-gnu-1
216-
env:
217-
IMAGE: i686-gnu
218-
SCRIPT: >
219-
python3 ../x.py --stage 2 test
220-
tests/ui
221-
tests/rustdoc
222-
tests/run-make
223-
tests/rustdoc-ui
224-
tests/ui-fulldeps
225-
tests/rustdoc
226216
<<: *job-linux-4c
227217

228218
- image: i686-gnu-2
229-
env:
230-
IMAGE: i686-gnu
231-
SCRIPT: >
232-
python3 ../x.py --stage 2 test
233-
--skip tests/ui
234-
--skip tests/rustdoc
235-
--skip tests/run-make
236-
--skip tests/rustdoc-ui
237-
--skip tests/ui-fulldeps
238-
--skip tests/rustdoc
239-
--skip src/bootstrap
240-
--skip tests/rustdoc-js
241-
--skip src/tools/error_index_generator
242-
--skip src/tools/linkchecker
243219
<<: *job-linux-4c
244220

245221
- image: i686-gnu-nopt-1
246-
env:
247-
IMAGE: i686-gnu-nopt
248-
SCRIPT: >
249-
python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std &&
250-
python3 ../x.py --stage 2 test
251-
tests/ui
252-
tests/rustdoc
253-
tests/run-make
254-
tests/rustdoc-ui
255-
tests/ui-fulldeps
256-
tests/rustdoc
257222
<<: *job-linux-4c
258223

259224
- image: i686-gnu-nopt-2
260-
env:
261-
IMAGE: i686-gnu-nopt
262-
SCRIPT: >
263-
python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std &&
264-
python3 ../x.py --stage 2 test
265-
--skip tests/ui
266-
--skip tests/rustdoc
267-
--skip tests/run-make
268-
--skip tests/rustdoc-ui
269-
--skip tests/ui-fulldeps
270-
--skip tests/rustdoc
271225
<<: *job-linux-4c
272226

273227
- image: mingw-check

0 commit comments

Comments
 (0)