update spack and use dlaf@master

eth-cscs · Dec 2, 2024 · a5a26bc · a5a26bc
1 parent 41f70a0
commit a5a26bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ci/ci-common.yml b/ci/ci-common.yml
@@ -29,8 +29,8 @@ stages:
     reports:
       dotenv: build.env
   variables:
-    SPACK_SHA: 05c7ff4595a4e574cbcf45475c626b9b94c22af1
-    SPACK_BUILDCACHE: develop-2024-06-02
+    SPACK_SHA: develop-2024-12-01
+    SPACK_BUILDCACHE: develop-2024-12-01
     SPACK_DLAF_FORTRAN_REPO: ./spack
     DOCKER_BUILD_ARGS: '[
         "BASE_IMAGE",

diff --git a/ci/docker/common.yaml b/ci/docker/common.yaml
@@ -39,6 +39,9 @@ packages:
   hwloc:
     variants:
       - '~libxml2'
+  dla-future:
+    require:
+      - '@master'
   git:
     # Force git as non-buildable to allow deprecated versions in environments
     # https://github.com/spack/spack/pull/30040