From 65e062a080e9d2956196382a6a26e850a46982a5 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 28 Jan 2024 19:44:36 +0000
Subject: [PATCH] chore: pythia8-8.310
---
containers/jug/dev.Dockerfile | 5 ++++-
spack-environment/packages.yaml | 2 +-
spack.sh | 4 +++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 0d5c50d85..515727f1d 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -36,6 +36,8 @@ ARG SPACK_CHERRYPICKS=""
ARG SPACK_CHERRYPICKS_FILES=""
ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/spack.json
RUN <<EOF
+git config --global user.email "gitlab@eicweb.phy.anl.gov"
+git config --global user.name "EIC Container Build Service"
git config --global advice.detachedHead false
git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT}
git -C ${SPACK_ROOT} checkout ${SPACK_VERSION}
@@ -45,8 +47,9 @@ if [ -n "${SPACK_CHERRYPICKS}" ] ; then
for hash in ${SPACK_CHERRYPICKS} ; do
if [ -n "${SPACK_CHERRYPICKS_FILES_ARRAY[${hash}]+found}" ] ; then
git -C ${SPACK_ROOT} show ${hash} -- ${SPACK_CHERRYPICKS_FILES_ARRAY[${hash}]//,/ } | patch -p1 -d ${SPACK_ROOT}
+ git -C ${SPACK_ROOT} commit --all --message "$(git -C ${SPACK_ROOT} show --no-patch --pretty=format:%s ${hash})"
else
- git -C ${SPACK_ROOT} cherry-pick -n ${hash}
+ git -C ${SPACK_ROOT} cherry-pick ${hash}
fi
done
fi
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 606b950ba..4a42b32b7 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -230,7 +230,7 @@ packages:
- +plot
pythia8:
require:
- - '@8.309'
+ - '@8.310'
- +fastjet +root
python:
require:
diff --git a/spack.sh b/spack.sh
index ccc33f79b..256b51d2e 100644
--- a/spack.sh
+++ b/spack.sh
@@ -29,6 +29,7 @@ c07ddf83c32b7129247fe90eed486dd844047087
1255620a14afa3ad4aad681a847a3a1704141976
0fed2d66bf0eec799707dd1b88ac9419f6ae14e1
963e2ca82883cdc1287f1035c15d1a7e9a6fe612
+d3c796f2ce1da2dda198707def297aeab702d33c
19c20563cc86140aaf352d72079bd9de292be0ac
---
## Optional hash table with comma-separated file list
@@ -59,4 +60,5 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 1255620a14afa3ad4aad681a847a3a1704141976: Fix infinite recursion when computing concretization errors
## 0fed2d66bf0eec799707dd1b88ac9419f6ae14e1: (py-)onnx: new version 1.14.{0,1}, 1.15.0
## 963e2ca82883cdc1287f1035c15d1a7e9a6fe612: edm4hep: add latest tag 0.10.3
-## 19c20563cc86140aaf352d72079bd9de292be0ac: Initial License Checkin
\ No newline at end of file
+## d3c796f2ce1da2dda198707def297aeab702d33c: pythia8: new version 8.310
+## 19c20563cc86140aaf352d72079bd9de292be0ac: Initial License Checkin
--
GitLab