From b099981c91c726303fda4b7da69bad153f35afae Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 3 Nov 2018 20:19:44 +0100 Subject: [PATCH] fix CI msvc build outside git bash It was only by accident that git bash worked for CI basing on the "real_pwd()" expression. Replace the dubious replacement pattern with "cygpath", which is present on git bash, Cygwin, and msys2 alike. In particular git bash uses msys2 internally. I was able to confirm a working build under msys2 with a wrapper for MSVC invocation via the Ninja generator. --- CI/before_script.msvc.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index c328dd8820..55dda74af8 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -194,7 +194,11 @@ download() { } real_pwd() { - pwd | sed "s,/\(.\),\1:," + if type cygpath >/dev/null 2>&1; then + cygpath -am "$PWD" + else + pwd # not git bash, Cygwin or the like + fi } CMAKE_OPTS=""