Skip to content

Commit 6ccf039

Browse files
authored
Rollup merge of rust-lang#38632 - alexcrichton:trim-travis, r=japaric
Trim down Travis docker images slightly Two things we no longer need: * ccache, we now use sccache * A `/tmp/obj` dir no longer used
2 parents 9bb3543 + 03d4fc5 commit 6ccf039

File tree

12 files changed

+0
-38
lines changed

12 files changed

+0
-38
lines changed

src/ci/docker/arm-android/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RUN dpkg --add-architecture i386 && \
1111
python2.7 \
1212
git \
1313
cmake \
14-
ccache \
1514
unzip \
1615
expect \
1716
openjdk-9-jre \
@@ -50,5 +49,3 @@ ENV RUST_CONFIGURE_ARGS \
5049
--i686-linux-android-ndk=/android/ndk-x86-9 \
5150
--aarch64-linux-android-ndk=/android/ndk-aarch64
5251
ENV XPY_CHECK test --target arm-linux-androideabi
53-
RUN mkdir /tmp/obj
54-
RUN chmod 777 /tmp/obj

src/ci/docker/cross/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gcc-aarch64-linux-gnu libc6-dev-arm64-cross \
1514
gcc-arm-linux-gnueabi libc6-dev-armel-cross \
@@ -70,6 +69,3 @@ ENV AR_s390x_unknown_linux_gnu=s390x-linux-gnu-ar \
7069

7170
# FIXME(rust-lang/rust#36150): powerpc unfortunately aborts right now
7271
ENV NO_LLVM_ASSERTIONS=1
73-
74-
RUN mkdir /tmp/obj
75-
RUN chmod 777 /tmp/obj

src/ci/docker/i686-gnu-nopt/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gdb \
1514
xz-utils
@@ -25,5 +24,3 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2524

2625
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
2726
ENV RUST_CHECK_TARGET check
28-
RUN mkdir /tmp/obj
29-
RUN chmod 777 /tmp/obj

src/ci/docker/i686-gnu/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gdb \
1514
xz-utils
@@ -25,5 +24,3 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2524

2625
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
2726
ENV RUST_CHECK_TARGET check
28-
RUN mkdir /tmp/obj
29-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-freebsd/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
bzip2 \
1514
xz-utils \
@@ -33,5 +32,3 @@ ENV \
3332

3433
ENV RUST_CONFIGURE_ARGS --target=x86_64-unknown-freebsd
3534
ENV RUST_CHECK_TARGET ""
36-
RUN mkdir /tmp/obj
37-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-gnu-cargotest/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
libssl-dev \
1413
sudo \
1514
xz-utils \
@@ -27,5 +26,3 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2726
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
2827
ENV RUST_CHECK_TARGET check-cargotest
2928
ENV NO_VENDOR 1
30-
RUN mkdir /tmp/obj
31-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-gnu-debug/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gdb \
1514
xz-utils
@@ -28,5 +27,3 @@ ENV RUST_CONFIGURE_ARGS \
2827
--enable-debug \
2928
--enable-optimize
3029
ENV RUST_CHECK_TARGET ""
31-
RUN mkdir /tmp/obj
32-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gdb \
1514
llvm-3.7-tools \
@@ -30,5 +29,3 @@ ENV RUST_CONFIGURE_ARGS \
3029
--build=x86_64-unknown-linux-gnu \
3130
--llvm-root=/usr/lib/llvm-3.7
3231
ENV RUST_CHECK_TARGET check
33-
RUN mkdir /tmp/obj
34-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-gnu-make/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gdb \
1514
xz-utils
@@ -25,5 +24,3 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2524

2625
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --disable-rustbuild
2726
ENV RUST_CHECK_TARGET check
28-
RUN mkdir /tmp/obj
29-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-gnu-nopt/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gdb \
1514
xz-utils
@@ -25,5 +24,3 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2524

2625
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --disable-optimize-tests
2726
ENV RUST_CHECK_TARGET check
28-
RUN mkdir /tmp/obj
29-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-gnu/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
sudo \
1413
gdb \
1514
xz-utils
@@ -25,5 +24,3 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2524

2625
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
2726
ENV RUST_CHECK_TARGET check
28-
RUN mkdir /tmp/obj
29-
RUN chmod 777 /tmp/obj

src/ci/docker/x86_64-musl/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12-
ccache \
1312
xz-utils \
1413
sudo \
1514
gdb
@@ -33,6 +32,3 @@ ENV RUST_CONFIGURE_ARGS \
3332
ENV RUST_CHECK_TARGET check-stage2-T-x86_64-unknown-linux-musl-H-x86_64-unknown-linux-gnu
3433
ENV PATH=$PATH:/musl-x86_64/bin
3534
ENV XPY_CHECK test --target x86_64-unknown-linux-musl
36-
37-
RUN mkdir /tmp/obj
38-
RUN chmod 777 /tmp/obj

0 commit comments

Comments
 (0)