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
Merge requests
!272
Resolve "Track madx upstreaming and cherry-pick when ready"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Track madx upstreaming and cherry-pick when ready"
109-track-madx-upstreaming-and-cherry-pick-when-ready
into
master
Overview
0
Commits
2
Pipelines
0
Changes
2
Merged
Wouter Deconinck
requested to merge
109-track-madx-upstreaming-and-cherry-pick-when-ready
into
master
3 years ago
Overview
0
Commits
2
Pipelines
0
Changes
2
Expand
Closes
#109 (closed)
Edited
2 years ago
by
Wouter Deconinck
0
0
Merge request reports
Viewing commit
92a27bbf
Prev
Next
Show latest version
2 files
+
3
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
92a27bbf
madx 5.08.01 cherry-pick and use
· 92a27bbf
Wouter Deconinck
authored
2 years ago
.gitlab-ci.yml
+
2
−
1
Options
@@ -11,13 +11,14 @@ variables:
## Spack github version
SPACK_VERSION
:
"
e974b44e8673ded449ce4a3ed5844398b68e81a2"
## Space-separated list of spack cherry-picks
SPACK_CHERRYPICKS
:
"
0ab5828d0dfe2182ad108b7e7c56772303065f6e
a294acfb73839c9782aff976953a969fb44e161e
f181b6fef6da3b576b267799d9c47fa5c8ade67a
5f10562ad13c803bf5d22552a9f07c8c379fdd23
4c0f5f85c0dc27903280ba64d129c2e3d128573d"
SPACK_CHERRYPICKS
:
"
0ab5828d0dfe2182ad108b7e7c56772303065f6e
a294acfb73839c9782aff976953a969fb44e161e
f181b6fef6da3b576b267799d9c47fa5c8ade67a
5f10562ad13c803bf5d22552a9f07c8c379fdd23
4c0f5f85c0dc27903280ba64d129c2e3d128573d
6610c50414cdb451c2073a28ffc4bc3c5fd7b721
"
## Ref: https://github.com/spack/spack/commit/[hash]
## 0ab5828d0dfe2182ad108b7e7c56772303065f6e: gdk-pixbuf: Fix 2.42.2 and add 2.42.6
## a294acfb73839c9782aff976953a969fb44e161e: pythia8: bugfix for pythia8 +fastjet
## f181b6fef6da3b576b267799d9c47fa5c8ade67a: root: depends_on fcgi and re-enabled +http support
## 5f10562ad13c803bf5d22552a9f07c8c379fdd23: [geant4] new version geant4@10.7.3
## 4c0f5f85c0dc27903280ba64d129c2e3d128573d: EDM4hep version 0.4
## 6610c50414cdb451c2073a28ffc4bc3c5fd7b721: madx: new package, versions 5.07.00, 5.08.00, 5.08.01
## We need to enable Docker Buildkit to use cache mounts and better
## build performance overal
Loading