From b6ba4527e329831190a84e7a5aaf3467e7f76ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 20 Sep 2026 20:20:45 +0200 Subject: [PATCH] [Build] Rework Windows installer artifact exclusions per review --- .ci/compile.sh | 2 ++ cockatrice/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index fc13d50c3..f20432893 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -344,6 +344,8 @@ if [[ $MAKE_PACKAGE ]]; then echo "::warning file=$0::7-Zip not found, skipping installer content check" else echo "Inspecting $package" + # Fail the build if the installer contains any path left behind by the MSBuild or + # Qt AUTOMOC tooling (build-tree artifacts must live in the build dir, not the install) if "$seven_zip" l "$package" | grep -E "_autogen|\.dir[\\/]|\.tlog|(^|[\\/])x64[\\/]|(^|[\\/])\.qt[\\/]|(^|[\\/])\.qsb[\\/]|(^|[\\/])\.lupdate[\\/]|CMakeFiles"; then echo "::error file=$0::Installer contains build-tree artifacts" diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 1ca7089f5..765f54398 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -675,6 +675,7 @@ if(WIN32) DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/" DESTINATION ./ FILES_MATCHING + PATTERN "*.ini" PATTERN "CMakeFiles*" EXCLUDE PATTERN "*.dir*" EXCLUDE PATTERN "*_autogen*" EXCLUDE @@ -684,7 +685,6 @@ if(WIN32) PATTERN ".qt*" EXCLUDE PATTERN ".qsb*" EXCLUDE PATTERN ".lupdate*" EXCLUDE - PATTERN "*.ini" ) # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls