4 files changed, 52 insertions, 1 deletions
diff --git a/share/spack/bootstrap/github-actions-v0.1/metadata.yaml b/share/spack/bootstrap/github-actions-v0.1/metadata.yaml
new file mode 100644
index 0000000000..b2439424b0
--- /dev/null
+++ b/share/spack/bootstrap/github-actions-v0.1/metadata.yaml
@@ -0,0 +1,8 @@
+type: buildcache
+description: |
+  Buildcache generated from a public workflow using Github Actions.
+  The sha256 checksum of binaries is checked before installation.
+info:
+  url: https://mirror.spack.io/bootstrap/github-actions/v0.1
+  homepage: https://github.com/spack/spack-bootstrap-mirrors
+  releases: https://github.com/spack/spack-bootstrap-mirrors/releases
diff --git a/share/spack/bootstrap/github-actions-v0.2/metadata.yaml b/share/spack/bootstrap/github-actions-v0.2/metadata.yaml
new file mode 100644
index 0000000000..f786731aa8
--- /dev/null
+++ b/share/spack/bootstrap/github-actions-v0.2/metadata.yaml
@@ -0,0 +1,8 @@
+type: buildcache
+description: |
+  Buildcache generated from a public workflow using Github Actions.
+  The sha256 checksum of binaries is checked before installation.
+info:
+  url: https://mirror.spack.io/bootstrap/github-actions/v0.2
+  homepage: https://github.com/spack/spack-bootstrap-mirrors
+  releases: https://github.com/spack/spack-bootstrap-mirrors/releases
diff --git a/share/spack/bootstrap/spack-install/metadata.yaml b/share/spack/bootstrap/spack-install/metadata.yaml
new file mode 100644
index 0000000000..c8ecaeb7e6
--- /dev/null
+++ b/share/spack/bootstrap/spack-install/metadata.yaml
@@ -0,0 +1,8 @@
+# This method is just Spack bootstrapping the software it needs from sources.
+# It has been added here so that users can selectively disable bootstrapping
+# from sources by "untrusting" it.
+type: install
+description: |
+  Specs built from sources downloaded from the Spack public mirror.
+info:
+  url: https://mirror.spack.io
diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash
index bfc44c444b..5e4498f395 100755
--- a/share/spack/spack-completion.bash
+++ b/share/spack/spack-completion.bash
@@ -434,7 +434,7 @@ _spack_bootstrap() {
     then
         SPACK_COMPREPLY="-h --help"
     else
-        SPACK_COMPREPLY="status enable disable reset root list trust untrust"
+        SPACK_COMPREPLY="status enable disable reset root list trust untrust add remove mirror"
     fi
 }
 
@@ -485,6 +485,33 @@ _spack_bootstrap_untrust() {
     fi
 }
 
+_spack_bootstrap_add() {
+    if $list_options
+    then
+        SPACK_COMPREPLY="-h --help --scope --trust"
+    else
+        SPACK_COMPREPLY=""
+    fi
+}
+
+_spack_bootstrap_remove() {
+    if $list_options
+    then
+        SPACK_COMPREPLY="-h --help"
+    else
+        SPACK_COMPREPLY=""
+    fi
+}
+
+_spack_bootstrap_mirror() {
+    if $list_options
+    then
+        SPACK_COMPREPLY="-h --help --binary-packages --dev"
+    else
+        SPACK_COMPREPLY=""
+    fi
+}
+
 _spack_build_env() {
     if $list_options
     then