File tree 3 files changed +7
-5
lines changed
3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ WORKDIR /build
31
31
# The `config` config file was a previously generated config file for
32
32
# the kernel. This file was generated by running `make defconfig`
33
33
# followed by `make menuconfig` and then enabling the IPv6 protocol page.
34
- COPY disabled/ aarch64-gnu/config /build/.config
34
+ COPY aarch64-gnu/config /build/.config
35
35
RUN curl https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.42.tar.xz | \
36
36
tar xJf - && \
37
37
cd /build/linux-4.4.42 && \
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
17
17
18
18
# emscripten
19
19
COPY scripts/emscripten-wasm.sh /scripts/
20
- COPY disabled/ wasm32-exp/node.sh /usr/local/bin/node
20
+ COPY wasm32-exp/node.sh /usr/local/bin/node
21
21
RUN bash /scripts/emscripten-wasm.sh
22
22
23
23
# cache
Original file line number Diff line number Diff line change @@ -36,12 +36,14 @@ elif [ -f "$docker_dir/disabled/$image/Dockerfile" ]; then
36
36
echo Cannot run disabled images on travis!
37
37
exit 1
38
38
fi
39
- retry docker \
39
+ # retry messes with the pipe from tar to docker. Not needed on non-travis
40
+ # Transform changes the context of disabled Dockerfiles to match the enabled ones
41
+ tar --transform ' s#^./disabled/#./#' -C $docker_dir -c . | docker \
40
42
build \
41
43
--rm \
42
44
-t rust-ci \
43
- -f " $docker_dir /disabled/ $ image /Dockerfile" \
44
- " $docker_dir "
45
+ -f " $image /Dockerfile" \
46
+ -
45
47
else
46
48
echo Invalid image: $image
47
49
exit 1
You can’t perform that action at this time.
0 commit comments