From 9387b8793c3fcd5ef9bbb466f152b82314798b8a Mon Sep 17 00:00:00 2001 From: rudy Date: Fri, 8 Apr 2022 14:45:18 +0200 Subject: [PATCH] feat(ci): clear ccache stats in docker image --- .github/workflows/continuous-integration.yml | 5 ----- builders/Dockerfile.concrete-compiler-df-env | 1 + builders/Dockerfile.concrete-compiler-env | 1 + builders/Dockerfile.concrete-compiler-gcc7-env | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 477af0267..944b18a68 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -79,7 +79,6 @@ jobs: - name: Build and test compiler if: ${{ matrix.compiler == 'gcc7' }} - id: build-compiler uses: addnab/docker-run-action@v3 with: registry: ghcr.io @@ -92,8 +91,6 @@ jobs: shell: bash run: | set -e - echo "Debug: ccache statistics (prior to the build):" - ccache -s cd /compiler rm -rf /build /opt/python/cp38-cp38/bin/pip install pytest @@ -131,8 +128,6 @@ jobs: shell: bash run: | set -e - echo "Debug: ccache statistics (prior to the build):" - ccache -s cd /compiler export PYTHONPATH="" make CCACHE=ON BUILD_DIR=/build concretecompiler python-bindings doc diff --git a/builders/Dockerfile.concrete-compiler-df-env b/builders/Dockerfile.concrete-compiler-df-env index 7eecbed12..7ee24b8c3 100644 --- a/builders/Dockerfile.concrete-compiler-df-env +++ b/builders/Dockerfile.concrete-compiler-df-env @@ -39,3 +39,4 @@ RUN make PARALLEL_EXECUTION_ENABLED=ON BUILD_DIR=/build CCACHE=ON \ ENV PYTHONPATH "$PYTHONPATH:/build/tools/concretelang/python_packages/concretelang_core" ENV PATH "$PATH:/build/bin" ENV RT_LIB "/build/lib/libConcretelangRuntime.so" +RUN ccache -z diff --git a/builders/Dockerfile.concrete-compiler-env b/builders/Dockerfile.concrete-compiler-env index fed908bc7..8d65864c1 100644 --- a/builders/Dockerfile.concrete-compiler-env +++ b/builders/Dockerfile.concrete-compiler-env @@ -29,3 +29,4 @@ RUN make BUILD_DIR=/build CCACHE=ON concretecompiler python-bindings && \ ENV PYTHONPATH "$PYTHONPATH:/build/tools/concretelang/python_packages/concretelang_core" ENV PATH "$PATH:/build/bin" ENV RT_LIB "/build/lib/libConcretelangRuntime.so" +RUN ccache -z diff --git a/builders/Dockerfile.concrete-compiler-gcc7-env b/builders/Dockerfile.concrete-compiler-gcc7-env index 8dffe5b90..a4721e624 100644 --- a/builders/Dockerfile.concrete-compiler-gcc7-env +++ b/builders/Dockerfile.concrete-compiler-gcc7-env @@ -28,3 +28,4 @@ WORKDIR /compiler RUN mkdir -p /build RUN make -e CXX_COMPILER=$CXX CC_COMPILER=$CC BUILD_DIR=/build Python3_EXECUTABLE=/opt/python/${python_tag}/bin/python CCACHE=ON python-bindings concretecompiler ENV PATH "$PATH:/build/bin" +RUN ccache -z