fixup 1119 and 1167 failing

This commit is contained in:
Viktor Szakats 2025-08-18 02:40:07 +02:00
parent ab7a345487
commit 9c4468cff4
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201

View file

@ -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|"