diff --git a/ci/build.sh b/ci/build.sh index 992e8a3..925a067 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -44,7 +44,7 @@ fi if [ "$OS" = "win" ]; then VS_WHERE="C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" - eval "$($(cygpath "$COMSPEC") /c$(cygpath -w "$ROOT/ci/vcvars_export.bat") bash)" + eval "$($(cygpath "$COMSPEC") /c$(cygpath -w "$ROOT/ci/vcvars_export.bat"))" MSBUILD_EXE=$("$VS_WHERE" -latest -requires Microsoft.Component.MSBuild -find "MSBuild\**\Bin\MSBuild.exe") echo $MSBUILD_EXE diff --git a/ci/vcvars_export.bat b/ci/vcvars_export.bat index 0cf62fe..b13ec1a 100644 --- a/ci/vcvars_export.bat +++ b/ci/vcvars_export.bat @@ -1,8 +1,7 @@ @echo off set VSWHERE="C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" - for /f "tokens=*" %%i in ('%VSWHERE% -latest -property installationPath') do set VSWHERE2=%%i call "%VSWHERE2%\Common7\Tools\VsDevCmd.bat" > nul -"%1" -c "export -p" \ No newline at end of file +bash -c "export -p" \ No newline at end of file