jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-27 08:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[Build] Rework Windows installer artifact exclusions per review

Browse source
This commit is contained in:
Lukas Brübach 2026-09-20 20:20:45 +02:00
parent 55ce3d18e6
commit b6ba4527e3
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.ci/compile.sh
View file

@ -344,6 +344,8 @@ if [[ $MAKE_PACKAGE ]]; then
echo "::warning file=$0::7-Zip not found, skipping installer content check" echo "::warning file=$0::7-Zip not found, skipping installer content check"
else else
echo "Inspecting $package" 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" | if "$seven_zip" l "$package" |
grep -E "_autogen|\.dir[\\/]|\.tlog|(^|[\\/])x64[\\/]|(^|[\\/])\.qt[\\/]|(^|[\\/])\.qsb[\\/]|(^|[\\/])\.lupdate[\\/]|CMakeFiles"; then grep -E "_autogen|\.dir[\\/]|\.tlog|(^|[\\/])x64[\\/]|(^|[\\/])\.qt[\\/]|(^|[\\/])\.qsb[\\/]|(^|[\\/])\.lupdate[\\/]|CMakeFiles"; then
echo "::error file=$0::Installer contains build-tree artifacts" echo "::error file=$0::Installer contains build-tree artifacts"

2
cockatrice/CMakeLists.txt
View file

@ -675,6 +675,7 @@ if(WIN32)
DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/" DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
DESTINATION ./ DESTINATION ./
FILES_MATCHING FILES_MATCHING
PATTERN "*.ini"
PATTERN "CMakeFiles*" EXCLUDE PATTERN "CMakeFiles*" EXCLUDE
PATTERN "*.dir*" EXCLUDE PATTERN "*.dir*" EXCLUDE
PATTERN "*_autogen*" EXCLUDE PATTERN "*_autogen*" EXCLUDE
@ -684,7 +685,6 @@ if(WIN32)
PATTERN ".qt*" EXCLUDE PATTERN ".qt*" EXCLUDE
PATTERN ".qsb*" EXCLUDE PATTERN ".qsb*" EXCLUDE
PATTERN ".lupdate*" EXCLUDE PATTERN ".lupdate*" EXCLUDE
PATTERN "*.ini"
) )
# Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls