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

chore: spack: avoid need for protobuf +cpp

parent 52c4c0a2
Branches
Tags
1 merge request!1009chore: spack: avoid need for protobuf +cpp
......@@ -72,16 +72,6 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
SPACK_ENV=${SPACK_ENV} \
BUILDCACHE_OCI_PROMPT="eicweb" \
BUILDCACHE_OCI_FINAL="ghcr"
spack gc --yes-to-all
spack find --long --no-groups \
| sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
| uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
| tee /tmp/duplicates.txt
if [ -s /tmp/duplicates.txt ] ; then
echo "Duplicate packages found"
cat /tmp/duplicates.txt | while read hash spec ; do spack spec --long /${hash} ; done
exit 1
fi
ccache --show-stats
ccache --zero-stats
EOF
......
......@@ -30,10 +30,16 @@ a66586d749197841bd74e289802126f2359287a8
7503a417731910d918a7863d1862f62c9b76429d
f8f01c336c882f29ac364995423b9f69ac365462
6051d56014730528da8dfa69934d93f9b7941a70
67536058077995cab1ed23b8ca62aaf75463ae04
7b9f8abce5cee74546a6f588f88c6f353170d52b
096ab11961995ac8d69f7b177cbcadf618d3068e
6c4abef75cb2b98c337f8a3179797e29dfdc9ca3
---
## Optional hash table with comma-separated file list
read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
--- || true
[67536058077995cab1ed23b8ca62aaf75463ae04]=var/spack/repos/builtin/packages/py-protobuf/package.py
[7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py
---
## Ref: https://github.com/spack/spack/commit/[hash]
## [hash]: [description]
......@@ -59,3 +65,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1
## f8f01c336c882f29ac364995423b9f69ac365462: clang: support cxx20_flag and cxx23_flag
## 6051d56014730528da8dfa69934d93f9b7941a70: fastjet: avoid plugins=all,cxx combinations
## 67536058077995cab1ed23b8ca62aaf75463ae04: Update py-pyspark and py-py4j (py-protobuf only)
## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran])
## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf
## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment