Merge pull request #6 from MuonColliderSoft/master

Updated package versions
MuonColliderSoft · Jun 17, 2023 · 8526367 · 8526367
2 parents 65314d4 + 9bab250
commit 8526367
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/concretize-template.yaml b/.github/workflows/concretize-template.yaml
@@ -10,7 +10,7 @@ jobs:
   concretize:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
     steps:
       - name: Checkout Spack
         uses: actions/checkout@v3

diff --git a/.github/workflows/concretize.yaml b/.github/workflows/concretize.yaml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 jobs:
   concretize:
     strategy:
+      fail-fast: false
       matrix:
         target: [common, release, release-debug]
     uses: ./.github/workflows/concretize-template.yaml

diff --git a/environments/mucoll-release/packages.yaml b/environments/mucoll-release/packages.yaml
@@ -5,11 +5,11 @@ packages:
     require: '@:2020.3'
 
   geant4:
-    require: '@10.6.3 ~qt+opengl+vecgeom cxxstd=17'
+    require: '@11.1.1 ~qt+opengl+vecgeom cxxstd=17'
   root:
-    require: '@6.26.6 +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=17 build_type=RelWithDebInfo'
+    require: '@6.28.02 +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=17 build_type=RelWithDebInfo'
   dd4hep:
-    require: '@1.23 +lcio+xercesc+hepmc3+edm4hep'
+    require: '@1.25.1 +lcio+xercesc+hepmc3+edm4hep'
   whizard:
     require: '@3.0.3 ~fastjet~latex+lcio~lhapdf+openloops~openmp+pythia8 hepmc=3'
   pythia8:
@@ -38,13 +38,13 @@ packages:
   lcfiplus:
     require: '@0.10.1'
   fastjet:
-    require: '@3.2.1'
+    require: '@3.4.0'
   marlinfastjet:
     require: '@0.5.3'
   marlintrk:
     require: '@2.9.1'
   marlintrkprocessors:
-    require: '@2.14'
+    require: '@2.15'
   forwardtracking:
     require: '@1.14'
   conformaltracking:
@@ -77,7 +77,7 @@ packages:
   clicperformance:
     require: '@2.4.1'
   muoncvxddigitiser:
-    require: '@master'
+    require: '@0.1'
 
   cedviewer:
     require: '@1.19.1'

diff --git a/packages/marlintrkprocessors/package.py b/packages/marlintrkprocessors/package.py
@@ -17,6 +17,7 @@ class Marlintrkprocessors(CMakePackage, MCIlcsoftpackage):
     maintainers = ['gianelle', 'pandreetto']
 
     version('master', branch='master')
+    version("2.15",   sha256="439c2d01bd36c165a2a9e19caeceb807466691a5f240984a2654e2b6d3d0bcbf")
     version('2.14',   sha256='3fda69fbbd23e8e3e7f3c47d898dcd301693286f0a17854e919cfbe68bf3918f')
     version('2.13',   sha256='a44fe66a62d252f5226ca710a913fca6337812af1b7937bfb050d8f2d34df011')
     version('2.12',   sha256='458b3e428aece3b7749bb292695320a1126d246ee40da8eede2a13714b204615')

diff --git a/packages/muoncvxddigitiser/package.py b/packages/muoncvxddigitiser/package.py
@@ -11,8 +11,10 @@ class Muoncvxddigitiser(CMakePackage, MCIlcsoftpackage):
 
     homepage = "https://github.com/MuonColliderSoft/MuonCVXDDigitiser"
     git      = "https://github.com/MuonColliderSoft/MuonCVXDDigitiser.git"
+    url      = "https://github.com/MuonColliderSoft/MuonCVXDDigitiser/archive/refs/tags/v00-01.tar.gz"
 
-    version('master',  branch='master')
+    version('master', branch='master')
+    version("0.1",    sha256="b4fe817025aeda01e0d503a91a5988b4c1d906dfcb02d2a505f013f8de90efc0")
 
 
     depends_on('ilcutil')