diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 69ca1f63de..9a094ad281 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -844,15 +844,15 @@ jobs: # has no stable disk location, its an MS-DOS batch file setting env, # and makes it problematic to use from this script. [[ "$(uname -s)" = *'ARM64'* ]] && MSVC_HOST='arm64' || MSVC_HOST='x64' # x86 - MSVC_ROOTD="$(cygpath --dos "$PROGRAMFILES/Microsoft Visual Studio")" # to avoid spaces in directory names + MSVC_ROOTD="$(cygpath --mixed --short-name "$PROGRAMFILES/Microsoft Visual Studio")" # to avoid spaces in directory names MSVC_ROOTU="$(/usr/bin/find "$(cygpath --unix "$MSVC_ROOTD/2022/Enterprise/vc/tools/msvc")" -mindepth 1 -maxdepth 1 -type d -name '*.*' | sort | tail -n 1)" - MSVC_ROOTW="$(cygpath --windows "$MSVC_ROOTU")" + MSVC_ROOTW="$(cygpath --mixed "$MSVC_ROOTU")" MSVC_ROOTU="$(cygpath --unix "$MSVC_ROOTW")" echo "MSVC_ROOTW:|$MSVC_ROOTW|" echo "MSVC_ROOTU:|$MSVC_ROOTU|" MSVC_BINU="$MSVC_ROOTU/bin/Host$MSVC_HOST/$MATRIX_ARCH" echo "MSVC_BINU:|$MSVC_BINU|" - MSDK_ROOTW="$(cygpath --dos "$(printenv 'ProgramFiles(x86)')/Windows Kits")/10" + MSDK_ROOTW="$(cygpath --mixed --short-name "$(printenv 'ProgramFiles(x86)')/Windows Kits")/10" MSDK_ROOTU="$(cygpath --unix "$MSDK_ROOTW")" MSDK_VER="$(basename "$(/usr/bin/find "$MSDK_ROOTU/lib" -mindepth 1 -maxdepth 1 -type d -name '*.*' | sort | tail -n 1)")" echo "MSDK_VER:|$MSDK_VER|"