diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30daddfd5cddcb2cfcad4ae7a5258658d3ef3276..0abd3fb0978ce28b9b5ae6c6bee3f2f11dfddac5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,8 +190,12 @@ tests nvidia: - docker build -t "recalbox-${ARCH}" . - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - mkdir -p ${OUTPUTDIR} + - echo "CLEAN CACHE STATISTICS" + - CCACHE_DIR="/recalbox-builds/ccaches/ccache-${ARCH}" ccache --zero-stats || true - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_BEEBEM=${GITLAB_TOKEN_BEEBEM}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - echo $? + - echo "CACHE STATISTICS" + - CCACHE_DIR="/recalbox-builds/ccaches/ccache-${ARCH}" ccache --show-stats || true # Dist - export DIST_DIR="dist/${ARCH}" - mkdir -p "${DIST_DIR}" diff --git a/Dockerfile b/Dockerfile index 0c21406d5f47471dc2ec39c49f34173d4aa49eea..69bc452963f8a3639806a123b5c16888b079b679 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ mercurial libdbus-glib-1-dev texinfo zip openssh-client libxml2-utils libpng-dev software-properties-common wget cpio bc locales rsync imagemagick bison flex bsdmainutils \ nano vim automake autopoint mtools dosfstools subversion openjdk-8-jdk libssl-dev libelf-dev \ graphviz python3 python3-matplotlib python3-numpy python3-six re2c libc6-dev-i386 libtool cabextract dos2unix \ -p7zip-full xsltproc && \ +p7zip-full xsltproc ccache && \ rm -rf /var/lib/apt/lists/* # Set the locale needed by toolchain