Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Commits
9d10e6d6
Commit
9d10e6d6
authored
5 months ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
chore: spack: avoid need for protobuf +cpp
parent
52c4c0a2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1009
chore: spack: avoid need for protobuf +cpp
Pipeline
#103731
failed
5 months ago
Stage: status-pending
Stage: config
Stage: base
Stage: eic
Stage: deploy
Stage: benchmarks
Stage: finalize
Stage: status-report
Pipeline: reconstruction_benchmarks
#103737
Pipeline: reconstruction_benchmarks
#103736
Pipeline: eic_container: eic/EICrecon: update dynamic range of B0 ECAL
#103735
+3
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/jug/dev.Dockerfile
+0
-10
0 additions, 10 deletions
containers/jug/dev.Dockerfile
spack.sh
+10
-0
10 additions, 0 deletions
spack.sh
with
10 additions
and
10 deletions
containers/jug/dev.Dockerfile
+
0
−
10
View file @
9d10e6d6
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
spack.sh
+
10
−
0
View file @
9d10e6d6
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment