about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2021-02-04 21:24:41 +0100
committerPietro Albini <pietro@pietroalbini.org>2021-02-04 21:24:41 +0100
commit575f6940b764bd0d3ea91919e84d3e428b19fc4e (patch)
treee872e685e183192e55a07437da9949b915880074
parentd3163e96553ae8cb1fca0e62084b124e8b98310b (diff)
downloadrust-575f6940b764bd0d3ea91919e84d3e428b19fc4e.tar.gz
rust-575f6940b764bd0d3ea91919e84d3e428b19fc4e.zip
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 commit changes the CI script to only copy the file if it doesn't
already exist.
-rwxr-xr-xsrc/ci/scripts/install-msys2.sh4
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