Skip to content

Commit 94ed071

Browse files
authoredMar 18, 2020
Rollup merge of #70116 - pietroalbini:ci-fix-windows-python-path, r=Mark-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.
2 parents 11053ba + 779e592 commit 94ed071

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed
 

‎src/ci/scripts/install-msys2-packages.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ if isWindows; then
1313
# one way or another. The msys interpreters seem to have weird path conversions
1414
# baked in which break LLVM's build system one way or another, so let's use the
1515
# native version which keeps everything as native as possible.
16-
cp C:/Python27amd64/python.exe C:/Python27amd64/python2.7.exe
17-
ciCommandAddPath "C:\\Python27amd64"
16+
python_home="C:/hostedtoolcache/windows/Python/2.7.17/x64"
17+
cp "${python_home}/python.exe" "${python_home}/python2.7.exe"
18+
ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\2.7.17\\x64"
1819
fi

0 commit comments

Comments
 (0)
Please sign in to comment.