From a5a26bca69306e9c0336e82a1d9c1a1627168b65 Mon Sep 17 00:00:00 2001
From: Rocco Meli <rocco.meli@cscs.ch>
Date: Mon, 2 Dec 2024 13:45:17 +0100
Subject: [PATCH] update spack and use dlaf@master

---
 ci/ci-common.yml      | 4 ++--
 ci/docker/common.yaml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/ci-common.yml b/ci/ci-common.yml
index 07edd64..8eb9cbe 100644
--- 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
index 28b8e83..c77cd2e 100644
--- 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