From 90c773488c59e57c19ecca5635c1ae7f70e56076 Mon Sep 17 00:00:00 2001 From: John Parent Date: Tue, 25 Jan 2022 17:29:17 -0500 Subject: Add Github Actions for Windows (#24504) Setup Installer CI (#25184), (#25191) Co-authored-by: Zack Galbreath Co-authored-by: lou.lawrence@kitware.com Co-authored-by: Betsy McPhail --- share/spack/qa/configuration/windows_config.yaml | 8 ++++++++ share/spack/qa/setup_spack.ps1 | 3 +++ share/spack/qa/vcvarsall.ps1 | 14 ++++++++++++++ share/spack/qa/windows_test_setup.ps1 | 11 +++++++++++ share/spack/spack-completion.bash | 10 +++++----- 5 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 share/spack/qa/configuration/windows_config.yaml create mode 100644 share/spack/qa/setup_spack.ps1 create mode 100644 share/spack/qa/vcvarsall.ps1 create mode 100644 share/spack/qa/windows_test_setup.ps1 (limited to 'share') diff --git a/share/spack/qa/configuration/windows_config.yaml b/share/spack/qa/configuration/windows_config.yaml new file mode 100644 index 0000000000..fb90000223 --- /dev/null +++ b/share/spack/qa/configuration/windows_config.yaml @@ -0,0 +1,8 @@ +config: + locks: false + install_tree: + root: $spack\opt\spack + projections: + all: '${ARCHITECTURE}\${COMPILERNAME}-${COMPILERVER}\${PACKAGE}-${VERSION}-${HASH}' + build_stage: + - ~/.spack/stage \ No newline at end of file diff --git a/share/spack/qa/setup_spack.ps1 b/share/spack/qa/setup_spack.ps1 new file mode 100644 index 0000000000..6b462916fa --- /dev/null +++ b/share/spack/qa/setup_spack.ps1 @@ -0,0 +1,3 @@ +spack compiler find +echo F|xcopy .\spack\share\spack\qa\configuration\windows_config.yaml $env:USERPROFILE\.spack\windows\config.yaml +spack external find cmake \ No newline at end of file diff --git a/share/spack/qa/vcvarsall.ps1 b/share/spack/qa/vcvarsall.ps1 new file mode 100644 index 0000000000..8172bcd69a --- /dev/null +++ b/share/spack/qa/vcvarsall.ps1 @@ -0,0 +1,14 @@ +$erroractionpreference = "stop" + +$VCVARSALL="C:\\Program Files (x86)\\MicroSoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat" +$VCVARSPLATFORM="x64" +$VCVARSVERSION="14.29.30038" + + +cmd /c "`"$VCVARSALL`" $VCVARSPLATFORM -vcvars_ver=$VCVARSVERSION & set" | +foreach { + if ($_ -match "=") { + $v = $_.split("=") + [Environment]::SetEnvironmentVariable($v[0], $v[1]) + } +} diff --git a/share/spack/qa/windows_test_setup.ps1 b/share/spack/qa/windows_test_setup.ps1 new file mode 100644 index 0000000000..eebd0b7480 --- /dev/null +++ b/share/spack/qa/windows_test_setup.ps1 @@ -0,0 +1,11 @@ +Set-Location ../ + +$env:python_pf_ver="C:\hostedtoolcache\windows\Python\3.9.5\x64\python.exe" + +cmd /c "`"spack\bin\spack_cmd.bat`" print " | +foreach { + if ($_ -match "=") { + $v = $_.split("=") + [Environment]::SetEnvironmentVariable($v[0], $v[1]) + } +} \ No newline at end of file diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index 3045052ecd..99572bea14 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -919,14 +919,14 @@ _spack_env() { _spack_env_activate() { if $list_options then - SPACK_COMPREPLY="-h --help --sh --csh --fish -v --with-view -V --without-view -p --prompt --temp -d --dir" + SPACK_COMPREPLY="-h --help --sh --csh --fish --bat -v --with-view -V --without-view -p --prompt --temp -d --dir" else _environments fi } _spack_env_deactivate() { - SPACK_COMPREPLY="-h --help --sh --csh --fish" + SPACK_COMPREPLY="-h --help --sh --csh --fish --bat" } _spack_env_create() { @@ -1205,7 +1205,7 @@ _spack_list() { _spack_load() { if $list_options then - SPACK_COMPREPLY="-h --help --sh --csh --fish --first --only --list" + SPACK_COMPREPLY="-h --help --sh --csh --fish --bat --first --only --list" else _installed_packages fi @@ -1241,7 +1241,7 @@ _spack_maintainers() { _spack_make_installer() { if $list_options then - SPACK_COMPREPLY="-h --help -v --spack_version -s --spack_source" + SPACK_COMPREPLY="-h --help -v --spack_version -s --spack_source -g --git-installer-verbosity" else SPACK_COMPREPLY="" fi @@ -1809,7 +1809,7 @@ _spack_unit_test() { _spack_unload() { if $list_options then - SPACK_COMPREPLY="-h --help --sh --csh --fish -a --all" + SPACK_COMPREPLY="-h --help --sh --csh --fish --bat -a --all" else _installed_packages fi -- cgit v1.2.3-60-g2f50