Skip to content
Snippets Groups Projects
Commit 65e062a0 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

chore: pythia8-8.310

parent b4fdda43
No related branches found
No related tags found
1 merge request!823chore: pythia8-8.310
Hide whitespace changes
Inline Side-by-side
containers/jug/dev.Dockerfile
+ 4
− 1
View file @ 65e062a0
...@@ -36,6 +36,8 @@ ARG SPACK_CHERRYPICKS="" ...@@ -36,6 +36,8 @@ ARG SPACK_CHERRYPICKS=""
ARG SPACK_CHERRYPICKS_FILES="" ARG SPACK_CHERRYPICKS_FILES=""
ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/spack.json ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/spack.json
RUN <<EOF 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 config --global advice.detachedHead false
git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT}
git -C ${SPACK_ROOT} checkout ${SPACK_VERSION} git -C ${SPACK_ROOT} checkout ${SPACK_VERSION}
...@@ -45,8 +47,9 @@ if [ -n "${SPACK_CHERRYPICKS}" ] ; then ...@@ -45,8 +47,9 @@ if [ -n "${SPACK_CHERRYPICKS}" ] ; then
for hash in ${SPACK_CHERRYPICKS} ; do for hash in ${SPACK_CHERRYPICKS} ; do
if [ -n "${SPACK_CHERRYPICKS_FILES_ARRAY[${hash}]+found}" ] ; then 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} 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 else
git -C ${SPACK_ROOT} cherry-pick -n ${hash} git -C ${SPACK_ROOT} cherry-pick ${hash}
fi fi
done done
fi fi
......
spack-environment/packages.yaml
+ 1
− 1
View file @ 65e062a0
...@@ -230,7 +230,7 @@ packages: ...@@ -230,7 +230,7 @@ packages:
- +plot - +plot
pythia8: pythia8:
require: require:
- '@8.309' - '@8.310'
- +fastjet +root - +fastjet +root
python: python:
require: require:
......
spack.sh
+ 3
− 1
View file @ 65e062a0
...@@ -29,6 +29,7 @@ c07ddf83c32b7129247fe90eed486dd844047087 ...@@ -29,6 +29,7 @@ c07ddf83c32b7129247fe90eed486dd844047087
1255620a14afa3ad4aad681a847a3a1704141976 1255620a14afa3ad4aad681a847a3a1704141976
0fed2d66bf0eec799707dd1b88ac9419f6ae14e1 0fed2d66bf0eec799707dd1b88ac9419f6ae14e1
963e2ca82883cdc1287f1035c15d1a7e9a6fe612 963e2ca82883cdc1287f1035c15d1a7e9a6fe612
d3c796f2ce1da2dda198707def297aeab702d33c
19c20563cc86140aaf352d72079bd9de292be0ac 19c20563cc86140aaf352d72079bd9de292be0ac
--- ---
## Optional hash table with comma-separated file list ## Optional hash table with comma-separated file list
...@@ -59,4 +60,5 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ...@@ -59,4 +60,5 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 1255620a14afa3ad4aad681a847a3a1704141976: Fix infinite recursion when computing concretization errors ## 1255620a14afa3ad4aad681a847a3a1704141976: Fix infinite recursion when computing concretization errors
## 0fed2d66bf0eec799707dd1b88ac9419f6ae14e1: (py-)onnx: new version 1.14.{0,1}, 1.15.0 ## 0fed2d66bf0eec799707dd1b88ac9419f6ae14e1: (py-)onnx: new version 1.14.{0,1}, 1.15.0
## 963e2ca82883cdc1287f1035c15d1a7e9a6fe612: edm4hep: add latest tag 0.10.3 ## 963e2ca82883cdc1287f1035c15d1a7e9a6fe612: edm4hep: add latest tag 0.10.3
## 19c20563cc86140aaf352d72079bd9de292be0ac: Initial License Checkin ## d3c796f2ce1da2dda198707def297aeab702d33c: pythia8: new version 8.310
\ No newline at end of file ## 19c20563cc86140aaf352d72079bd9de292be0ac: Initial License Checkin
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment