about summary refs log tree commit diff
path: root/src/ci/scripts/install-msys2-packages.sh
diff options
context:
space:
mode:
authorMateusz MikuĊ‚a <mati865@gmail.com>2020-06-10 00:48:43 +0200
committerMark Rousskov <mark.simulacrum@gmail.com>2020-07-26 11:30:42 -0400
commit41895ca93f3722adf5855089442de3abc94458f0 (patch)
tree3c697026c11f13b35d61371c36921e6b3d1de1ca /src/ci/scripts/install-msys2-packages.sh
parent32166ab1ebec2e5e5454221f0d3238c21382de9f (diff)
downloadrust-41895ca93f3722adf5855089442de3abc94458f0.tar.gz
rust-41895ca93f3722adf5855089442de3abc94458f0.zip
Use preinstalled MSYS2
Diffstat (limited to 'src/ci/scripts/install-msys2-packages.sh')
-rwxr-xr-xsrc/ci/scripts/install-msys2-packages.sh27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh
deleted file mode 100755
index ff7479c05d0..00000000000
--- a/src/ci/scripts/install-msys2-packages.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-IFS=$'\n\t'
-
-source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
-
-if isWindows; then
-    pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar \
-        binutils
-
-    # Detect the native Python version installed on the agent. On GitHub
-    # Actions, the C:\hostedtoolcache\windows\Python directory contains a
-    # 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)"
-
-    # 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"
-    cp "${python_home}/python.exe" "${python_home}/python3.exe"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
-fi