From 52406e9ed3d87ecdc901707c24ed9302464e80b5 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Wed, 27 Mar 2024 16:00:40 +0100 Subject: [PATCH 1/3] Update `Cargo.lock` to solve building error --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 04897385c..3b5390adb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -950,7 +950,7 @@ dependencies = [ [[package]] name = "managed-lhapdf" version = "0.2.4" -source = "git+https://github.com/cschwan/managed-lhapdf.git#e3b18307adf41d82baceaebad995d542e6a3811e" +source = "git+https://github.com/cschwan/managed-lhapdf.git#789512841c3e6e1bb82216b83806a59702b18a5f" dependencies = [ "anyhow", "cxx", From 9c9e698940f093537a83e5948e3e9632ceb75832 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Wed, 27 Mar 2024 16:43:58 +0100 Subject: [PATCH 2/3] Enable installation of static libraries in container --- maintainer/pineappl-ci/script.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainer/pineappl-ci/script.sh b/maintainer/pineappl-ci/script.sh index 49e65078d..304cdc6c3 100755 --- 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 From eb3310beb96000e83e9e7e86e65455efe4599f7e Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Wed, 27 Mar 2024 17:38:42 +0100 Subject: [PATCH 3/3] Remove Rust versions to save disk space --- maintainer/pineappl-ci/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainer/pineappl-ci/Containerfile b/maintainer/pineappl-ci/Containerfile index 5db5c9b18..6981817f9 100644 --- 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"