about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKristofer Rye <kristofer.rye@gmail.com>2020-07-17 08:29:01 -0500
committerKristofer Rye <kristofer.rye@gmail.com>2020-07-17 08:29:01 -0500
commit49f50780480421e524adf6262a285003d6f8281e (patch)
tree724ae0db04bb02891e7884e61a620bd20818a2e9
parentab23a2a9c54fed2acbd553407a761f19af6e8ed4 (diff)
downloadrust-49f50780480421e524adf6262a285003d6f8281e.tar.gz
rust-49f50780480421e524adf6262a285003d6f8281e.zip
ci: Stop setting CI_OVERRIDE_SHELL environment variable
This will render the src/ci/exec-with-shell.py script more or less
useless, but we're going to replace that by just using the system bash
instead.

Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
-rwxr-xr-xsrc/ci/scripts/install-msys2.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 3a0c965a677..185d3615825 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -12,9 +12,6 @@ if isWindows; then
     mkdir -p "${msys2Path}/home/${USERNAME}"
     ciCommandAddPath "${msys2Path}/usr/bin"
 
-    echo "switching shell to use our own bash"
-    ciCommandSetEnv CI_OVERRIDE_SHELL "${msys2Path}/usr/bin/bash.exe"
-
     # 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.