summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorJohn W. Parent <45471568+johnwparent@users.noreply.github.com>2024-09-06 08:26:46 -0400
committerGitHub <noreply@github.com>2024-09-06 14:26:46 +0200
commit4042afaa99426d8ed35643e531b69a8012fbd3f2 (patch)
tree5ff5555897e77f6538a192ee623595b54bbccc90 /share
parent7fdf1029b747555f1d3040075bfeaf322ee6837e (diff)
downloadspack-4042afaa99426d8ed35643e531b69a8012fbd3f2.tar.gz
spack-4042afaa99426d8ed35643e531b69a8012fbd3f2.tar.bz2
spack-4042afaa99426d8ed35643e531b69a8012fbd3f2.tar.xz
spack-4042afaa99426d8ed35643e531b69a8012fbd3f2.zip
Bootstrap GnuPG and `file` on Windows (#41810)
Spack can now bootstrap two new dependencies on Windows: GnuPG, and file. These dependencies are modeled as a separate package, and they install a cross-compiled binary. Details on how they binaries are built are in https://github.com/spack/windows-bootstrap-resources
Diffstat (limited to 'share')
-rw-r--r--share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml2
-rw-r--r--share/spack/gitlab/cloud_pipelines/configs/win64/ci.yaml2
-rw-r--r--share/spack/qa/bootstrap-file.py4
3 files changed, 6 insertions, 2 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index eceb9f3964..7dcce7eb27 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -218,7 +218,7 @@ default:
- $ErrorActionPreference=$ErrorActionOld
tags: ["spack", "public", "medium", "x86_64-win"]
- image: "ghcr.io/johnwparent/windows-server21h2:sha-c749cf3"
+ image: "ghcr.io/johnwparent/windows-server21h2:sha-1c12b61"
.generate-deprecated:
extends: [ ".base-job" ]
diff --git a/share/spack/gitlab/cloud_pipelines/configs/win64/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/win64/ci.yaml
index 834c640fc3..2d8aedf6d4 100644
--- a/share/spack/gitlab/cloud_pipelines/configs/win64/ci.yaml
+++ b/share/spack/gitlab/cloud_pipelines/configs/win64/ci.yaml
@@ -15,4 +15,4 @@ ci:
- spack.ps1 config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{hash}'"
- mkdir ${SPACK_ARTIFACTS_ROOT}/user_data
- spack.ps1 --backtrace ci rebuild | Tee-Object -FilePath "${env:SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt" 2>&1 | Tee-Object -FilePath "${env:SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt"
- image: "ghcr.io/johnwparent/windows-server21h2:sha-c749cf3"
+ image: "ghcr.io/johnwparent/windows-server21h2:sha-1c12b61"
diff --git a/share/spack/qa/bootstrap-file.py b/share/spack/qa/bootstrap-file.py
new file mode 100644
index 0000000000..720bd99bbc
--- /dev/null
+++ b/share/spack/qa/bootstrap-file.py
@@ -0,0 +1,4 @@
+from spack.util.filesystem import file_command
+
+if __name__ == "__main__":
+ file_command()