From d7297e67a5dd7ae2f902e927fafa62519c1977a6 Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Date: Tue, 7 May 2024 08:49:53 +0200
Subject: Maintenance for the "bootstrap" workflow in CI (#44031)

Removed a lot of duplication.

Fixed an issue in containers, leading to false negative
---
 .github/workflows/bootstrap-test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.github/workflows/bootstrap-test.sh')

diff --git a/.github/workflows/bootstrap-test.sh b/.github/workflows/bootstrap-test.sh
index b51db3d1b7..563eb28643 100755
--- a/.github/workflows/bootstrap-test.sh
+++ b/.github/workflows/bootstrap-test.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
-set -ex
+set -e
 source share/spack/setup-env.sh
+$PYTHON bin/spack bootstrap disable github-actions-v0.4
 $PYTHON bin/spack bootstrap disable spack-install
-$PYTHON bin/spack -d solve zlib
+$PYTHON bin/spack $SPACK_FLAGS solve zlib
 tree $BOOTSTRAP/store
 exit 0
-- 
cgit v1.2.3-70-g09d2