diff options
| author | bors <bors@rust-lang.org> | 2021-02-04 20:30:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-04 20:30:11 +0000 |
| commit | 4f4656d46d84a488ae3df34b08f362d7071036a0 (patch) | |
| tree | 32494bfc6504f2d44a274585cd9207d4a5f10eef /src/ci | |
| parent | 822ebfd2c43fbe466da8ae34ffe3ce6cba2e8336 (diff) | |
| parent | 575f6940b764bd0d3ea91919e84d3e428b19fc4e (diff) | |
| download | rust-4f4656d46d84a488ae3df34b08f362d7071036a0.tar.gz rust-4f4656d46d84a488ae3df34b08f362d7071036a0.zip | |
Auto merge of #81762 - pietroalbini:fix-install-msys2, r=m-ou-se
CI: only copy python.exe to python3.exe if the latter does not exist We're copying the binary to make sure we can call `python3.exe` around, but it seems like the base image of GitHub Actions changed, copying the file before we do so. This PR changes the CI script to only copy the file if it doesn't already exist. r? `@m-ou-se` cc `@Mark-Simulacrum`
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/scripts/install-msys2.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh index 185d3615825..0aa4b42a6a8 100755 --- a/src/ci/scripts/install-msys2.sh +++ b/src/ci/scripts/install-msys2.sh @@ -24,7 +24,9 @@ if isWindows; then # 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" - cp "${python_home}/python.exe" "${python_home}/python3.exe" + 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" fi |