From 6bde39a2b1dc8ac63cd2e8624c16e35f7a6bd0b8 Mon Sep 17 00:00:00 2001 From: "Pavel Milanes (CO7WT)" Date: Thu, 5 Dec 2019 00:43:32 -0500 Subject: [PATCH] Refs #342, setting the msys2 shell in the install script --- ci-scripts/install-windows.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ci-scripts/install-windows.sh b/ci-scripts/install-windows.sh index f48d986..dc1339a 100644 --- a/ci-scripts/install-windows.sh +++ b/ci-scripts/install-windows.sh @@ -2,17 +2,21 @@ set +e +# this script is run by the git shell, not by the msys2 so we need to make a wrapper for run command inside +# msys2 shell lite pacman installs, etc... +export shell="cmd.exe //C RefreshEnv.cmd & C:/tools/msys64/msys2_shell.cmd -defterm -mingw64 -no-start -full-path -here -c \$\* --" + # install msys2 using chocolatey choco install msys2 -pacman -Sy make gcc protobuf unzip python3-pip tree +$shell pacman -Sy make gcc protobuf unzip python3-pip tree # There are no available packages for MSYS2, listed below # To make them work under MSYS2, we need to move all files to MSYS2 /usr/ -pacman -Sy mingw-w64-x86_64-check -pacman -Sy mingw-w64-x86_64-SDL2 -pacman -Sy mingw-w64-x86_64-protobuf-c -pacman -Sy mingw-w64-x86_64-clang +$shell pacman -Sy mingw-w64-x86_64-check +$shell pacman -Sy mingw-w64-x86_64-SDL2 +$shell pacman -Sy mingw-w64-x86_64-protobuf-c +$shell pacman -Sy mingw-w64-x86_64-clang set -e && echo "If u got error" # debug the fylesystem structure on travis