diff options
| author | James McCoy <jamessan@jamessan.com> | 2021-02-04 22:18:19 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2021-02-05 22:39:10 -0500 |
| commit | 8f2419949059b0018d6ddf29473bd92c2c6f96b5 (patch) | |
| tree | b46f92f78cb19cd2ee31e61a0ccfbd6992b16971 | |
| parent | 94cf7bba008ff0c36828565a408b7ef79203e069 (diff) | |
| download | rneovim-8f2419949059b0018d6ddf29473bd92c2c6f96b5.tar.gz rneovim-8f2419949059b0018d6ddf29473bd92c2c6f96b5.tar.bz2 rneovim-8f2419949059b0018d6ddf29473bd92c2c6f96b5.zip | |
ci(gha/win): Do not rename python.exe to python3.exe if it exists
GHA now provides python3.exe by default -- actions/python-versions#78
Ensure Python 2 directory is earlier in $PATH so bare python always
invokes Python 2.
| -rw-r--r-- | ci/build.ps1 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index db7026ac66..53e4328e02 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -88,11 +88,14 @@ elseif ($compiler -eq 'MSVC') { if (-not $NoTests) { # Setup python (use AppVeyor system python) - C:\hostedtoolcache\windows\Python\2.7.18\x64\python.exe -m pip install pynvim ; exitIfFailed - C:\hostedtoolcache\windows\Python\3.5.4\x64\python.exe -m pip install pynvim ; exitIfFailed - # Disambiguate python3 - move C:\hostedtoolcache\windows\Python\3.5.4\x64\python.exe C:\hostedtoolcache\windows\Python\3.5.4\x64\python3.exe - $env:PATH = "C:\hostedtoolcache\windows\Python\3.5.4\x64;C:\hostedtoolcache\windows\Python\2.7.18\x64;$env:PATH" + # Disambiguate python3, if needed + if (-not (Test-Path -Path C:\hostedtoolcache\windows\Python\3.5.4\x64\python3.exe) ) { + move C:\hostedtoolcache\windows\Python\3.5.4\x64\python.exe C:\hostedtoolcache\windows\Python\3.5.4\x64\python3.exe + } + $env:PATH = "C:\hostedtoolcache\windows\Python\2.7.18\x64;C:\hostedtoolcache\windows\Python\3.5.4\x64;$env:PATH" + + python -m pip install pynvim ; exitIfFailed + python3 -m pip install pynvim ; exitIfFailed # Sanity check python -c "import pynvim; print(str(pynvim))" ; exitIfFailed python3 -c "import pynvim; print(str(pynvim))" ; exitIfFailed |