Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Jenkins and Docker configurations #94

Merged
merged 2 commits into from
Jan 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .jenkins/debian-12.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ FROM debian:12

LABEL org.opencontainers.image.source="https://github.com/marco-compiler/marco"

ARG LLVM_PARALLEL_COMPILE_JOBS=4
ARG LLVM_PARALLEL_LINK_JOBS=1
ARG LLVM_BUILD_TYPE=Release
ARG LLVM_ENABLE_ASSERTIONS=OFF

ARG MARCO_RUNTIME_BUILD_TYPE=Release

# Install compilation dependencies.
RUN apt update -y && \
apt install -y build-essential gfortran ninja-build lld mold cmake ccache \
Expand All @@ -19,6 +12,11 @@ COPY ./setup_venv.sh /tmp/
RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh

# Install LLVM.
ARG LLVM_PARALLEL_COMPILE_JOBS=4
ARG LLVM_PARALLEL_LINK_JOBS=1
ARG LLVM_BUILD_TYPE=Release
ARG LLVM_ENABLE_ASSERTIONS=OFF

COPY ./version_llvm.txt /tmp/
COPY ./install_llvm.sh /tmp/

Expand All @@ -28,6 +26,8 @@ RUN chmod +x /tmp/install_llvm.sh && \
/tmp/install_llvm.sh

# Install MARCO runtime libraries.
ARG MARCO_RUNTIME_BUILD_TYPE=Release

RUN apt update -y && \
apt install -y libopenblas-dev=0.3.21+ds-4 \
libsuitesparse-dev=1:5.12.0+dfsg-2 \
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/docker-prod-debian-12.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ node {
def dockerImage

stage('Build') {
docker.build(dockerDevImageName + ":" + env.GIT_COMMIT[0..6], dockerArgs)
docker.build(dockerDevImageName + ":" + env.GIT_COMMIT[0..6], dockerDevArgs)
dockerImage = docker.build(dockerProdImageName + ":" + env.GIT_COMMIT[0..6], dockerProdArgs)
}

Expand Down
14 changes: 7 additions & 7 deletions .jenkins/fedora-40.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ FROM fedora:40

LABEL org.opencontainers.image.source="https://github.com/marco-compiler/marco"

ARG LLVM_PARALLEL_COMPILE_JOBS=4
ARG LLVM_PARALLEL_LINK_JOBS=1
ARG LLVM_BUILD_TYPE=Release
ARG LLVM_ENABLE_ASSERTIONS=OFF

ARG MARCO_RUNTIME_BUILD_TYPE=Release

# Install compilation dependencies.
RUN dnf update -y && \
dnf install -y gcc gcc-c++ gfortran perl ninja-build mold cmake ccache \
Expand All @@ -19,6 +12,11 @@ COPY ./setup_venv.sh /tmp/
RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh

# Install LLVM.
ARG LLVM_PARALLEL_COMPILE_JOBS=4
ARG LLVM_PARALLEL_LINK_JOBS=1
ARG LLVM_BUILD_TYPE=Release
ARG LLVM_ENABLE_ASSERTIONS=OFF

COPY ./version_llvm.txt /tmp/
COPY ./install_llvm.sh /tmp/

Expand All @@ -28,6 +26,8 @@ RUN chmod +x /tmp/install_llvm.sh && \
/tmp/install_llvm.sh

# Install MARCO runtime libraries.
ARG MARCO_RUNTIME_BUILD_TYPE=Release

RUN dnf update -y && \
dnf install -y openblas-devel-0.3.26-4.fc40 \
suitesparse-devel-7.6.0-1.fc40 \
Expand Down
14 changes: 7 additions & 7 deletions .jenkins/ubuntu-22.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ FROM ubuntu:22.04

LABEL org.opencontainers.image.source="https://github.com/marco-compiler/marco"

ARG LLVM_PARALLEL_COMPILE_JOBS=4
ARG LLVM_PARALLEL_LINK_JOBS=1
ARG LLVM_BUILD_TYPE=Release
ARG LLVM_ENABLE_ASSERTIONS=OFF

ARG MARCO_RUNTIME_BUILD_TYPE=Release

# Install compilation dependencies.
RUN apt update -y && \
apt install -y build-essential gfortran ninja-build lld mold cmake ccache \
Expand All @@ -19,6 +12,11 @@ COPY ./setup_venv.sh /tmp/
RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh

# Install LLVM.
ARG LLVM_PARALLEL_COMPILE_JOBS=4
ARG LLVM_PARALLEL_LINK_JOBS=1
ARG LLVM_BUILD_TYPE=Release
ARG LLVM_ENABLE_ASSERTIONS=OFF

COPY ./version_llvm.txt /tmp/
COPY ./install_llvm.sh /tmp/

Expand All @@ -28,6 +26,8 @@ RUN chmod +x /tmp/install_llvm.sh && \
/tmp/install_llvm.sh

# Install MARCO runtime libraries.
ARG MARCO_RUNTIME_BUILD_TYPE=Release

RUN apt update -y && \
apt install -y libopenblas-dev=0.3.20+ds-1 \
libsuitesparse-dev=1:5.10.1+dfsg-4build1 \
Expand Down
Loading