diff options
author | James McCoy <jamessan@jamessan.com> | 2021-02-06 07:10:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-06 07:10:58 -0500 |
commit | f4f6cce952c1233136f243e76d096e3aaa0b1689 (patch) | |
tree | 6a993beb573b25a540a73058d9897b8db2afe304 | |
parent | 02a9663869dce4df458f68e620265ec6b471eb06 (diff) | |
parent | 8f2419949059b0018d6ddf29473bd92c2c6f96b5 (diff) | |
download | rneovim-f4f6cce952c1233136f243e76d096e3aaa0b1689.tar.gz rneovim-f4f6cce952c1233136f243e76d096e3aaa0b1689.tar.bz2 rneovim-f4f6cce952c1233136f243e76d096e3aaa0b1689.zip |
Merge pull request #13888 from jamessan/win-ci
ci(gha/win): Do not rename python.exe to python3.exe if it exists
-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 |