Update metadata for bootstrapping (#33665)

lib/spack/spack/cmd/bootstrap.py

@@ -30,7 +30,7 @@
 
 
 # Tarball to be downloaded if binary packages are requested in a local mirror
-BINARY_TARBALL = "https://github.com/spack/spack-bootstrap-mirrors/releases/download/v0.2/bootstrap-buildcache.tar.gz"
+BINARY_TARBALL = "https://github.com/spack/spack-bootstrap-mirrors/releases/download/v0.4/bootstrap-buildcache.tar.gz"
 
 #: Subdirectory where to create the mirror
 LOCAL_MIRROR_DIR = "bootstrap_cache"
@@ -50,8 +50,8 @@
     },
 }
 
-CLINGO_JSON = "$spack/share/spack/bootstrap/github-actions-v0.2/clingo.json"
-GNUPG_JSON = "$spack/share/spack/bootstrap/github-actions-v0.2/gnupg.json"
+CLINGO_JSON = "$spack/share/spack/bootstrap/github-actions-v0.4/clingo.json"
+GNUPG_JSON = "$spack/share/spack/bootstrap/github-actions-v0.4/gnupg.json"
 
 # Metadata for a generated source mirror
 SOURCE_METADATA = {
@@ -449,10 +449,10 @@ def write_metadata(subdir, metadata):
 
 def _now(args):
     with spack.bootstrap.ensure_bootstrap_configuration():
-        spack.bootstrap.ensure_clingo_importable_or_raise()
-        spack.bootstrap.ensure_gpg_in_path_or_raise()
         if platform.system().lower() == "linux":
             spack.bootstrap.ensure_patchelf_in_path_or_raise()
+        spack.bootstrap.ensure_clingo_importable_or_raise()
+        spack.bootstrap.ensure_gpg_in_path_or_raise()
 
 
 def bootstrap(parser, args):

lib/spack/spack/test/cmd/bootstrap.py

@@ -168,7 +168,7 @@ def test_remove_and_add_a_source(mutable_config):
     assert not sources
 
     # Add it back and check we restored the initial state
-    _bootstrap("add", "github-actions", "$spack/share/spack/bootstrap/github-actions-v0.2")
+    _bootstrap("add", "github-actions", "$spack/share/spack/bootstrap/github-actions-v0.3")
     sources = spack.bootstrap.bootstrapping_sources()
     assert len(sources) == 1
 

lib/spack/spack/test/data/config/bootstrap.yaml

@@ -1,5 +1,5 @@
 bootstrap:
   sources:
   - name: 'github-actions'
-    metadata: $spack/share/spack/bootstrap/github-actions-v0.2
+    metadata: $spack/share/spack/bootstrap/github-actions-v0.3
   trusted: {}