From 3246f8b0356eae9c0906457befc94c69008f27d7 Mon Sep 17 00:00:00 2001 From: youben11 Date: Thu, 11 Nov 2021 12:36:21 +0100 Subject: [PATCH] chore: remove build files from docker image - Reduce the size of the docker image - Make sure ccache is always used => faster CI tests --- .github/workflows/conformance.yml | 1 + builders/Dockerfile.zamalang-env | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index a6265b0d6..632fe5783 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -36,6 +36,7 @@ jobs: cd /compiler pip install pytest rm -rf /build + export PYTHONPATH="" make CCACHE=ON BUILD_DIR=/build test echo "Debug: ccache statistics (after the build):" ccache -s diff --git a/builders/Dockerfile.zamalang-env b/builders/Dockerfile.zamalang-env index 1261a09d5..1df6d3e51 100644 --- a/builders/Dockerfile.zamalang-env +++ b/builders/Dockerfile.zamalang-env @@ -15,7 +15,17 @@ COPY /llvm-project /llvm-project COPY /compiler /compiler WORKDIR /compiler RUN mkdir -p /build -RUN make BUILD_DIR=/build CCACHE=ON zamacompiler python-bindings -ENV PYTHONPATH "$PYTHONPATH:/build/tools/zamalang/python_packages/zamalang_core:/build/tools/zamalang/python_packages/zamalang_core/mlir/_mlir_libs/" +RUN make BUILD_DIR=/build CCACHE=ON zamacompiler python-bindings && \ + mv /build/tools/zamalang/python_packages/zamalang_core /zamalang_core && \ + mv /build/bin/zamacompiler /bin && \ + mv /build/lib/libZamalangRuntime.so /lib && \ + rm -rf /build && \ + mkdir -p /build/tools/zamalang/python_packages/ && \ + mkdir -p /build/bin && \ + mkdir -p /build/lib && \ + mv /zamalang_core /build/tools/zamalang/python_packages/ && \ + mv /bin/zamacompiler /build/bin && \ + mv /lib/libZamalangRuntime.so /build/lib +ENV PYTHONPATH "$PYTHONPATH:/zamalang_core" ENV PATH "$PATH:/build/bin" ENV RT_LIB "/build/lib/libZamalangRuntime.so" \ No newline at end of file