Skip to content

Commit

Permalink
Rollup merge of #70116 - pietroalbini:ci-fix-windows-python-path, r=M…
Browse files Browse the repository at this point in the history
…ark-Simulacrum

ci: use python from the correct path

Apparently the old path we were using for Python 2 on Windows was not documented, and eventually got removed. This switches our CI to use the correct path.

See #70112 (comment) for the actual failure.
  • Loading branch information
pietroalbini authored Mar 18, 2020
2 parents 11053ba + 779e592 commit 94ed071
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/ci/scripts/install-msys2-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if isWindows; then
# one way or another. The msys interpreters seem to have weird path conversions
# baked in which break LLVM's build system one way or another, so let's use the
# native version which keeps everything as native as possible.
cp C:/Python27amd64/python.exe C:/Python27amd64/python2.7.exe
ciCommandAddPath "C:\\Python27amd64"
python_home="C:/hostedtoolcache/windows/Python/2.7.17/x64"
cp "${python_home}/python.exe" "${python_home}/python2.7.exe"
ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\2.7.17\\x64"
fi

0 comments on commit 94ed071

Please sign in to comment.