Merge branch 'master' into debug-container-creation

NNPDF · Mar 27, 2024 · e2cad39 · e2cad39
2 parents 82b6dc1 + eb3310b
commit e2cad39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/maintainer/pineappl-ci/Containerfile b/maintainer/pineappl-ci/Containerfile
@@ -7,7 +7,7 @@ ARG FASTNLO_V=2.5.0-2826
 ARG LHAPDF_V=6.4.0
 
 # the last version is the default Rust version used in the container
-ARG RUST_V="1.64.0 1.70.0 nightly-2024-01-25"
+ARG RUST_V="1.70.0"
 
 ENV APPL_IGRID_DIR="/usr/local/src/applgrid-${APPLGRID_V}/src"
 ENV CARGO_HOME="/usr/local/cargo"

diff --git a/maintainer/pineappl-ci/script.sh b/maintainer/pineappl-ci/script.sh
@@ -30,7 +30,7 @@ rm -r /usr/local/cargo/registry
 ( curl "https://lhapdf.hepforge.org/downloads/?f=LHAPDF-${LHAPDF_V}.tar.gz" || \
     curl "https://web.archive.org/web/20211018095814/https://lhapdf.hepforge.org/downloads/?f=LHAPDF-6.4.0.tar.gz" ) | tar xzf -
 cd LHAPDF-${LHAPDF_V}
-./configure --disable-python --disable-static
+./configure --disable-python
 make -j
 make install
 ldconfig
@@ -45,7 +45,7 @@ done
 # install APPLgrid
 curl "https://applgrid.hepforge.org/downloads?f=applgrid-${APPLGRID_V}.tgz" | tar xzf -
 cd applgrid-${APPLGRID_V}
-./configure --disable-static --without-root
+./configure --without-root
 make -j
 make install
 ldconfig
@@ -57,7 +57,7 @@ cd ..
 # install fastNLO
 curl "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${FASTNLO_V}.tar.gz" | tar xzf -
 cd fastnlo_toolkit-${FASTNLO_V}
-./configure --disable-static --prefix=/usr/local/
+./configure --prefix=/usr/local/
 make -j
 make install
 ldconfig