mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

Dockerfiles: don't ignore make failures

Browse Source 
Commit 299e4b4 ("travis: enable ccache for docker/qemu builds") combined
multiple RUN statements in Dockerfiles into a single one, which is good
for performance (as there is an intermediate cache created after each
statement). Unfortunately, it partially did so by combining statements
with use of semicolons, meaning we are ignoring non-zero exit codes.
As a result, failure from make are ignored and Travis builds are all
green.

To fix, replace all occurences of semicolon with &&.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kir Kolyshkin
2017-03-29 13:15:58 -07:00
committed by Pavel Emelyanov
parent bc93f12abd
commit e4000c59a7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/Dockerfile.alpine
View File

@@ -20,8 +20,8 @@ RUN apk update && apk add \
COPY . /criu
WORKDIR /criu
ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
RUN mv .ccache /tmp; make mrproper; ccache -s; \
date; make -j $(nproc) CC="$CC"; date
RUN mv .ccache /tmp && make mrproper && ccache -s && \
date && make -j $(nproc) CC="$CC" && date
# Run a test
RUN apk add py-yaml \

12
scripts/build/Dockerfile.tmpl
View File

@@ -24,18 +24,18 @@ COPY . /criu
WORKDIR /criu
ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
RUN mv .ccache /tmp && make mrproper; ccache -s; \
date; \
RUN mv .ccache /tmp && make mrproper && ccache -s && \
date && \
# Check single object build
make -j $(nproc) CC="$CC" criu/parasite-syscall.o; \
make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
# Compile criu
make -j $(nproc) CC="$CC"; \
date; \
make -j $(nproc) CC="$CC" && \
date && \
# Check that "make mrproper" works
make mrproper && ! git clean -ndx --exclude=scripts/build \
--exclude=.config --exclude=test | grep .
# Compile tests
RUN date; make -j $(nproc) CC="$CC" -C test/zdtm; date
RUN date && make -j $(nproc) CC="$CC" -C test/zdtm && date
#RUN make test/compel/handle_binary && ./test/compel/handle_binary