Add bug fix, don't use custom runner, disable geant/root for now

celeritas-project · May 17, 2024 · ce47b20 · ce47b20
1 parent 5dd2a6c
commit ce47b20
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -13,25 +13,38 @@ env:
 
 jobs:
   rebuild:
-    runs-on: self-hosted
     permissions:
       packages: write
     steps:
     - name: Checkout
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
+    - name: Install dependencies
+      run: |
+        sudo apt-get -q -y update
+        sudo apt-get -q -y install \
+          ccache cmake ninja-build python3 \
+      
     - name: Setup Spack
       uses: spack/setup-spack@0ce61628ed8a32a5664cf01a0e0b5a4834a3b413 # 2024/03
       with:
         ref: ${{env.SPACK_REF}}
         buildcache: true
         color: true
 
+    # TODO: https://github.com/spack/spack/pull/43136
+    - name: Add Spack bug fix
+      run: curl -LfsS https://github.com/spack/spack/pull/43136.patch | git -C spack apply -
+
     - 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
         spack mirror add --unsigned celer-buildcache oci://ghcr.io/celeritas-project/spack-gha-buildcache
 
     - name: Concretize

diff --git a/spack.yaml b/spack.yaml
@@ -8,22 +8,22 @@ spack:
       - hepmc3
       - ninja
       - nlohmann-json
-      - root
+        #- 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
   config:
     install_tree:
       root: /opt/spack
-      padded_length: 116
+      padded_length: 128
       projections:
         all: "{compiler.name}-{compiler.version}/{name}/{version}/{hash:7}"
   packages: