Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
majaha committed Feb 13, 2024
1 parent 1686c35 commit 52e9dc3
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions src/ci/scripts/install-msys2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ if isWindows; then
# subdirectory for each installed Python version.
#
# The -V flag of the sort command sorts the input by version number.
native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"
# native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"

# Make sure we use the native python interpreter instead of some msys equivalent
# 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.
python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
if ! [[ -f "${python_home}/python3.exe" ]]; then
cp "${python_home}/python.exe" "${python_home}/python3.exe"
fi
ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
# # Make sure we use the native python interpreter instead of some msys equivalent
# # 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.
# python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
# if ! [[ -f "${python_home}/python3.exe" ]]; then
# cp "${python_home}/python.exe" "${python_home}/python3.exe"
# fi
# ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
# ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"

# Install pacboy for easily installing packages
pacman -S --noconfirm pactoys
Expand Down

0 comments on commit 52e9dc3

Please sign in to comment.