diff options
-rw-r--r-- | .github/workflows/setup_git.ps1 | 5 | ||||
-rw-r--r-- | lib/spack/docs/getting_started.rst | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/.github/workflows/setup_git.ps1 b/.github/workflows/setup_git.ps1 index 19d3b81b97..36e0157c54 100644 --- a/.github/workflows/setup_git.ps1 +++ b/.github/workflows/setup_git.ps1 @@ -9,8 +9,3 @@ if ($(git branch --show-current) -ne "develop") { git branch develop origin/develop } - -if ($(git branch --show-current) -ne "features/windows-support") -{ - git branch features/windows-support origin/features/windows-support -} diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst index 32007332d5..049f66a09e 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst @@ -1748,6 +1748,6 @@ For developers The intent is to provide a Windows installer that will automatically set up Python, Git, and Spack, instead of requiring the user to do so manually. Instructions for creating the installer are at -https://github.com/spack/spack/blob/features/windows-support/lib/spack/spack/cmd/installer/README.md. +https://github.com/spack/spack/blob/develop/lib/spack/spack/cmd/installer/README.md Alternatively a pre-built copy of the Windows installer is available as an artifact of Spack's Windows CI |