From 50bbfc16342f295f12b2b0fdfac3e7e4d7a647b5 Mon Sep 17 00:00:00 2001
From: Michael Woolnough <130465766+mjkw31@users.noreply.github.com>
Date: Thu, 25 Apr 2024 11:10:07 +0100
Subject: [PATCH] Setup build cache after concretisation (#26)

As it changes how the dependencies are determined, meaning that some recipe updates are not taken into account (e.g. deprecation).
---
 build/builder_test.go  | 4 ++--
 build/singularity.tmpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/builder_test.go b/build/builder_test.go
index a889b8e..2c4fed1 100644
--- a/build/builder_test.go
+++ b/build/builder_test.go
@@ -146,14 +146,14 @@ EOF
 
 	# Install all the required software
 	. /opt/spack/share/spack/setup-env.sh
-	spack mirror add s3cache "s3://spack"
 	tmpDir="$(mktemp -d)"
 	git clone "`+gmhttp.URL+`" "$tmpDir"
 	git -C "$tmpDir" checkout "`+commitHash+`"
 	spack repo add "$tmpDir"
-	spack buildcache keys --install --trust
 	spack config add "config:install_tree:padded_length:128"
 	spack -e . concretize
+	spack mirror add s3cache "s3://spack"
+	spack buildcache keys --install --trust
 	if bash -c "type -P xvfb-run" > /dev/null; then
 		xvfb-run -a spack -e . install --fail-fast
 	else
diff --git a/build/singularity.tmpl b/build/singularity.tmpl
index 9f4cb13..72af3c8 100644
--- a/build/singularity.tmpl
+++ b/build/singularity.tmpl
@@ -23,14 +23,14 @@ EOF
 
 	# Install all the required software
 	. /opt/spack/share/spack/setup-env.sh
-	spack mirror add s3cache "{{ .S3BinaryCache }}"
 	tmpDir="$(mktemp -d)"
 	git clone "{{ .RepoURL }}" "$tmpDir"
 	git -C "$tmpDir" checkout "{{ .RepoRef }}"
 	spack repo add "$tmpDir"
-	spack buildcache keys --install --trust
 	spack config add "config:install_tree:padded_length:128"
 	spack -e . concretize
+	spack mirror add s3cache "{{ .S3BinaryCache }}"
+	spack buildcache keys --install --trust
 	if bash -c "type -P xvfb-run" > /dev/null; then
 		xvfb-run -a spack -e . install --fail-fast
 	else