Delay the installation of runtime dependencies

marco-compiler · Sep 19, 2024 · 451dd75 · 451dd75
1 parent 752f7eb
commit 451dd75
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 24 deletions.
diff --git a/.jenkins/dev-debian-12.Dockerfile b/.jenkins/dev-debian-12.Dockerfile
@@ -7,10 +7,7 @@ ARG LLVM_PARALLEL_LINK_JOBS=1
 
 RUN apt update -y && \
     apt install -y build-essential gfortran ninja-build lld mold cmake ccache \
-    git python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen \
-    libopenblas-dev=0.3.21+ds-4 \
-    libsuitesparse-dev=1:5.12.0+dfsg-2 \
-    libsundials-dev=6.4.1+dfsg1-3
+    git python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen
 
 COPY ./setup_venv.sh /tmp/
 RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh
@@ -25,6 +22,11 @@ RUN chmod +x /tmp/install_llvm.sh && \
     LLVM_ENABLE_ASSERTIONS=ON \
     /tmp/install_llvm.sh
 
+RUN apt update -y && \
+    apt install -y libopenblas-dev=0.3.21+ds-4 \
+    libsuitesparse-dev=1:5.12.0+dfsg-2 \
+    libsundials-dev=6.4.1+dfsg1-3
+
 COPY ./version_marco_runtime.txt /tmp/
 COPY ./install_marco_runtime.sh /tmp/
 

diff --git a/.jenkins/dev-fedora-40.Dockerfile b/.jenkins/dev-fedora-40.Dockerfile
@@ -7,10 +7,7 @@ ARG LLVM_PARALLEL_LINK_JOBS=1
 
 RUN dnf update -y && \
     dnf install -y gcc gcc-c++ gfortran perl ninja-build mold cmake ccache \
-    git python3-pip python3-virtualenv libxml2-devel wget doxygen \
-    openblas-devel-0.3.26-4.fc40 \
-    suitesparse-devel-7.6.0-1.fc40 \
-    sundials-devel-6.6.2-7.fc40
+    git python3-pip python3-virtualenv libxml2-devel wget doxygen
 
 COPY ./setup_venv.sh /tmp/
 RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh
@@ -25,6 +22,11 @@ RUN chmod +x /tmp/install_llvm.sh && \
     LLVM_ENABLE_ASSERTIONS=ON \
     /tmp/install_llvm.sh
 
+RUN dnf update -y && \
+    dnf install -y openblas-devel-0.3.26-4.fc40 \
+    suitesparse-devel-7.6.0-1.fc40 \
+    sundials-devel-6.6.2-7.fc40
+
 COPY ./version_marco_runtime.txt /tmp/
 COPY ./install_marco_runtime.sh /tmp/
 

diff --git a/.jenkins/dev-ubuntu-22.04.Dockerfile b/.jenkins/dev-ubuntu-22.04.Dockerfile
@@ -7,10 +7,7 @@ ARG LLVM_PARALLEL_LINK_JOBS=1
 
 RUN apt update -y && \
     apt install -y build-essential gfortran ninja-build lld mold cmake ccache \
-    git python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen \
-    libopenblas-dev=0.3.20+ds-1 \
-    libsuitesparse-dev=1:5.10.1+dfsg-4build1 \
-    libsundials-dev=5.8.0+dfsg-1build1
+    git python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen
 
 COPY ./setup_venv.sh /tmp/
 RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh
@@ -25,6 +22,11 @@ RUN chmod +x /tmp/install_llvm.sh && \
     LLVM_ENABLE_ASSERTIONS=ON \
     /tmp/install_llvm.sh
 
+RUN apt update -y && \
+    apt install -y libopenblas-dev=0.3.20+ds-1 \
+    libsuitesparse-dev=1:5.10.1+dfsg-4build1 \
+    libsundials-dev=5.8.0+dfsg-1build1
+
 COPY ./version_marco_runtime.txt /tmp/
 COPY ./install_marco_runtime.sh /tmp/
 

diff --git a/.jenkins/prod-debian-12.Dockerfile b/.jenkins/prod-debian-12.Dockerfile
@@ -7,10 +7,7 @@ ARG LLVM_PARALLEL_LINK_JOBS=1
 
 RUN apt update -y && \
     apt install -y build-essential gfortran ninja-build lld mold cmake ccache \
-    git python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen \
-    libopenblas-dev=0.3.21+ds-4 \
-    libsuitesparse-dev=1:5.12.0+dfsg-2 \
-    libsundials-dev=6.4.1+dfsg1-3
+    git python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen
 
 COPY ./setup_venv.sh /tmp/
 RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh
@@ -25,6 +22,11 @@ RUN chmod +x /tmp/install_llvm.sh && \
     LLVM_ENABLE_ASSERTIONS=OFF \
     /tmp/install_llvm.sh
 
+RUN apt update -y && \
+    apt install -y libopenblas-dev=0.3.21+ds-4 \
+    libsuitesparse-dev=1:5.12.0+dfsg-2 \
+    libsundials-dev=6.4.1+dfsg1-3
+
 COPY ./version_marco_runtime.txt /tmp/
 COPY ./install_marco_runtime.sh /tmp/
 

diff --git a/.jenkins/prod-fedora-40.Dockerfile b/.jenkins/prod-fedora-40.Dockerfile
@@ -7,10 +7,7 @@ ARG LLVM_PARALLEL_LINK_JOBS=1
 
 RUN dnf update -y && \
     dnf install -y gcc gcc-c++ gfortran perl ninja-build cmake ccache git \
-    python3-pip python3-virtualenv libxml2-devel wget doxygen \
-    openblas-devel-0.3.26-4.fc40 \
-    suitesparse-devel-7.6.0-1.fc40 \
-    sundials-devel-6.6.2-7.fc40
+    python3-pip python3-virtualenv libxml2-devel wget doxygen
 
 COPY ./setup_venv.sh /tmp/
 RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh
@@ -25,6 +22,11 @@ RUN chmod +x /tmp/install_llvm.sh && \
     LLVM_ENABLE_ASSERTIONS=OFF \
     /tmp/install_llvm.sh
 
+RUN dnf update -y && \
+    dnf install -y openblas-devel-0.3.26-4.fc40 \
+    suitesparse-devel-7.6.0-1.fc40 \
+    sundials-devel-6.6.2-7.fc40
+
 COPY ./version_marco_runtime.txt /tmp/
 COPY ./install_marco_runtime.sh /tmp/
 

diff --git a/.jenkins/prod-ubuntu-22.04.Dockerfile b/.jenkins/prod-ubuntu-22.04.Dockerfile
@@ -7,10 +7,7 @@ ARG LLVM_PARALLEL_LINK_JOBS=1
 
 RUN apt update -y && \
     apt install -y build-essential gfortran ninja-build lld cmake ccache git \
-    python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen \
-    libopenblas-dev=0.3.20+ds-1 \
-    libsuitesparse-dev=1:5.10.1+dfsg-4build1 \
-    libsundials-dev=5.8.0+dfsg-1build1
+    python3-pip python3-venv libxml2-dev libtinfo-dev wget doxygen
 
 COPY ./setup_venv.sh /tmp/
 RUN chmod +x /tmp/setup_venv.sh && /tmp/setup_venv.sh
@@ -25,6 +22,11 @@ RUN chmod +x /tmp/install_llvm.sh && \
     LLVM_ENABLE_ASSERTIONS=OFF \
     /tmp/install_llvm.sh
 
+RUN apt update -y && \
+    apt install -y libopenblas-dev=0.3.20+ds-1 \
+    libsuitesparse-dev=1:5.10.1+dfsg-4build1 \
+    libsundials-dev=5.8.0+dfsg-1build1
+
 COPY ./version_marco_runtime.txt /tmp/
 COPY ./install_marco_runtime.sh /tmp/