From 854149b21f8ac3a9145e15b00c07bddf88389c4b Mon Sep 17 00:00:00 2001 From: Seth R Johnson Date: Fri, 17 May 2024 09:59:28 -0400 Subject: [PATCH] Don't use externals, install geant4 --- .github/workflows/build.yaml | 3 --- spack.yaml | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index eae3ecd..7afaf17 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,9 +40,6 @@ jobs: - name: Find compilers run: spack -e . compiler find --mixed-toolchain - - name: Find externals - run: spack external find ccache cmake ninja python - - name: Set buildcache run: | spack mirror add --unsigned upstream oci://ghcr.io/spack/github-actions-buildcache diff --git a/spack.yaml b/spack.yaml index 353ca39..4085248 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,12 +11,12 @@ spack: #- root - swig - vecgeom - # - 'geant4@10.5' - # - 'geant4@10.6' - # - 'geant4@10.7' - # - 'geant4@11.0' - # - 'geant4@11.1' - # - 'geant4@11.2' + - 'geant4@10.5' + - 'geant4@10.6' + - 'geant4@10.7' + # - 'geant4@11.0' + # - 'geant4@11.1' + # - 'geant4@11.2' - - '%clang@15' concretizer: unify: false