ci: use gcc7.5 in linux release builds

This commit is contained in:
youben11
2022-01-19 14:05:54 +01:00
committed by Antoniu Pop
parent 87994d000e
commit 05ebbb1029
2 changed files with 14 additions and 2 deletions

View File

@@ -6,6 +6,12 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential ninja-bu
ARG python_tag=cp38-cp38
# Install python deps
RUN /opt/python/${python_tag}/bin/pip install numpy pybind11==2.6.2 PyYAML
# Setup gcc7
COPY --from=ghcr.io/zama-ai/gcc7:latest /gcc7 /gcc7
ENV PATH=/gcc7/bin:$PATH
ENV LD_LIBRARY_PATH=/gcc7/lib/:/gcc7/lib64/:$LD_LIBRARY_PATH
ENV CC=/gcc7/bin/gcc-7.5.0
ENV CXX=/gcc7/bin/g++-7.5.0
# Setup LLVM
COPY /llvm-project /llvm-project
# Setup Concrete
@@ -14,7 +20,7 @@ ENV CONCRETE_PROJECT=/concrete
# Setup and build compiler
COPY /compiler /compiler
WORKDIR /compiler
RUN make Python3_EXECUTABLE=/opt/python/${python_tag}/bin/python python-bindings
RUN make -e CXX_COMPILER=$CXX CC_COMPILER=$CC Python3_EXECUTABLE=/opt/python/${python_tag}/bin/python python-bindings
# Fix MLIR package
RUN touch build/tools/concretelang/python_packages/concretelang_core/mlir/__init__.py
RUN touch build/tools/concretelang/python_packages/concretelang_core/mlir/dialects/__init__.py

View File

@@ -2,6 +2,12 @@ FROM quay.io/pypa/manylinux_2_24_x86_64
RUN apt-get update
RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential ninja-build
# Setup gcc7
COPY --from=ghcr.io/zama-ai/gcc7:latest /gcc7 /gcc7
ENV PATH=/gcc7/bin:$PATH
ENV LD_LIBRARY_PATH=/gcc7/lib/:/gcc7/lib64/:$LD_LIBRARY_PATH
ENV CC=/gcc7/bin/gcc-7.5.0
ENV CXX=/gcc7/bin/g++-7.5.0
# Setup LLVM
COPY /llvm-project /llvm-project
# Setup Concrete
@@ -11,7 +17,7 @@ ENV CONCRETE_PROJECT=/concrete
COPY .github/workflows/assets/Installation.md /
COPY /compiler /compiler
WORKDIR /compiler
RUN make BINDINGS_PYTHON_ENABLED=OFF concretecompiler
RUN make -e CXX_COMPILER=$CXX CC_COMPILER=$CC BINDINGS_PYTHON_ENABLED=OFF concretecompiler
# Build tarball
RUN mkdir -p /tarballs/concretecompiler/lib /tarballs/concretecompiler/bin && \
cp /compiler/build/bin/concretecompiler /tarballs/concretecompiler/bin && \