Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-17 16:47:50 +00:00
Code Issues Projects Releases Wiki Activity

ci: remove ccache setup

Browse source 
ccache was set up in Travis to speed up compilation by re-using the
.ccache directory from previous CI runs. As we are no longer using
Travis we can remove all CI related ccache setup.

Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
Adrian Reber 2021-03-10 07:47:37 +00:00 • committed by Andrei Vagin
parent 2e0107ead8
commit 288adfc591
11 changed files with 15 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/build/Dockerfile.alpine
View file

@ -6,7 +6,6 @@ RUN apk update && apk add \
$CC \
bash \
build-base \
ccache \
coreutils \
git \
gnutls-dev \
@ -26,9 +25,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 -sz && \
date && make -j $(nproc) CC="$CC" && date && ccache -s
ENV $ENV1=yes
RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
RUN apk add \
ip6tables \

6
scripts/build/Dockerfile.centos7
View file

@ -5,7 +5,6 @@ ARG ENV1=FOOBAR
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
RUN yum install -y \
ccache \
findutils \
gcc \
git \
@ -39,9 +38,8 @@ RUN yum install -y \
COPY . /criu
WORKDIR /criu
ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
RUN mv .ccache /tmp && make mrproper && ccache -sz && \
date && make -j $(nproc) CC="$CC" && date && ccache -s
ENV $ENV1=yes
RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
# The rpc test cases are running as user #1000, let's add the user
RUN adduser -u 1000 test

6
scripts/build/Dockerfile.centos8
View file

@ -7,7 +7,6 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.n
RUN yum config-manager --set-enabled powertools
RUN yum install -y --allowerasing \
asciidoc \
ccache \
coreutils \
chkconfig \
diffutils \
@ -44,9 +43,8 @@ ENV PYTHON=python3
COPY . /criu
WORKDIR /criu
ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
RUN mv .ccache /tmp && make mrproper && ccache -sz && \
date && make -j $(nproc) CC="$CC" && date && ccache -s
ENV $ENV1=yes
RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
# The rpc test cases are running as user #1000, let's add the user
RUN adduser -u 1000 test

5
scripts/build/Dockerfile.fedora.tmpl
View file

@ -7,9 +7,8 @@ RUN /bin/prepare-for-fedora-rawhide.sh
COPY . /criu
WORKDIR /criu
ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
RUN mv .ccache /tmp && make mrproper && ccache -sz && \
date && make -j $(nproc) CC="$CC" && date && ccache -s
ENV $ENV1=yes
RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
# The rpc test cases are running as user #1000, let's add the user
RUN adduser -u 1000 test

6
scripts/build/Dockerfile.linux32.tmpl
View file

@ -4,7 +4,6 @@ ARG ENV1=FOOBAR
COPY scripts/ci/apt-install /bin/apt-install
RUN apt-install \
ccache \
libnet-dev \
libnl-route-3-dev \
$CC \
@ -28,12 +27,11 @@ RUN apt-install \
COPY . /criu
WORKDIR /criu
ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
ENV $ENV1=yes
RUN uname -m && setarch linux32 uname -m && setarch --list
RUN mv .ccache /tmp && make mrproper && ccache -s && \
date && \
RUN make mrproper && date && \
# Check single object build
setarch linux32 make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
# Compile criu

1
scripts/build/Dockerfile.openj9-alpine
View file

@ -3,7 +3,6 @@ FROM adoptopenjdk/openjdk8-openj9:alpine
RUN apk update && apk add \
bash \
build-base \
ccache \
coreutils \
git \
gnutls-dev \

6
scripts/build/Dockerfile.tmpl
View file

@ -4,7 +4,6 @@ ARG ENV1=FOOBAR
COPY scripts/ci/apt-install /bin/apt-install
RUN apt-install \
ccache \
libnet-dev \
libnl-route-3-dev \
$CC \
@ -30,10 +29,9 @@ RUN apt-install \
COPY . /criu
WORKDIR /criu
ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
ENV $ENV1=yes
RUN mv .ccache /tmp && make mrproper && ccache -s && \
date && \
RUN make mrproper && date && \
# Check single object build
make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
# Compile criu

6
scripts/build/Makefile
View file

@ -19,10 +19,7 @@ Dockerfile.%: Dockerfile.%.hdr Dockerfile.%.tmpl
cat $^ > $@
$(TARGETS):
mkdir -p $(HOME)/.ccache
mv $(HOME)/.ccache ../../
$(CONTAINER_RUNTIME) build -t criu-$@ -f Dockerfile.$@ $(DB_CC) $(DB_ENV) ../..
$(CONTAINER_RUNTIME) run criu-$@ tar c -C /tmp .ccache | tar x -C $(HOME)
$(CONTAINER_RUNTIME) build -t criu-$@ -f Dockerfile.$@ $(DB_CC) ../..
.PHONY: $(TARGETS)
# Clang builds add some Docker build env
@ -32,6 +29,5 @@ endef
$(foreach t,$(TARGETS),$(eval $(call CLANG_DEP,$(t))))
%-clang: DB_CC=--build-arg CC=clang
%-clang: DB_ENV=--build-arg ENV1=CCACHE_CPP2
s390x-clang: DB_CC=--build-arg CC=clang-3.8
.PHONY: $(TARGETS_CLANG)