Skip to content

Commit 384e17b

Browse files
committed
fix: E2E capability detection — don't add gcc on Windows runners
Windows CI runners have g++.exe (MinGW/Strawberry) in PATH but it's not a proper mcpp-compatible GCC toolchain. Remove gcc detection on MINGW/MSYS. Also check .exe in scan-deps detection.
1 parent 4cc2f40 commit 384e17b

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

tests/e2e/run_all.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ case "$OS" in
6363
;;
6464
MINGW* | MSYS* | CYGWIN*)
6565
# Git Bash / MSYS2 on Windows: symlinks need admin or Developer Mode
66-
# Only add symlink capability when mklink is available without elevation
67-
# (Developer Mode sets MSYS=winsymlinks:nativestrict in Git Bash).
6866
if [[ "${MSYS:-}" == *winsymlinks* ]] || cmd.exe /c "mklink /?" &>/dev/null 2>&1; then
6967
CAPS+=(symlink)
7068
fi
71-
command -v g++ &>/dev/null && CAPS+=(gcc)
69+
# NOTE: Windows runners may have g++.exe (MinGW/Strawberry) in PATH
70+
# but it's not a proper mcpp-compatible GCC. Don't add gcc capability.
7271
;;
7372
esac
7473

@@ -79,7 +78,8 @@ esac
7978

8079
# scan-deps: clang-scan-deps available (needed for P1689 / Clang dyndep flows)
8180
if command -v clang-scan-deps &>/dev/null \
82-
|| ls "${MCPP_HOME}/registry/data/xpkgs/xim-x-llvm"/*/bin/clang-scan-deps 2>/dev/null | head -1 | grep -q .; then
81+
|| ls "${MCPP_HOME}/registry/data/xpkgs/xim-x-llvm"/*/bin/clang-scan-deps 2>/dev/null | head -1 | grep -q . \
82+
|| ls "${MCPP_HOME}/registry/data/xpkgs/xim-x-llvm"/*/bin/clang-scan-deps.exe 2>/dev/null | head -1 | grep -q .; then
8383
CAPS+=(scan-deps)
8484
fi
8585

0 commit comments

Comments
 (0)