copy over zlibd debug file

probably fixes other issues, but makes it so windows debug builds work again
also adds windows debug building to catch this stuff
This commit is contained in:
David Markowitz 2024-10-27 11:10:17 -07:00
parent 102e3556cf
commit e0b54645dc
4 changed files with 163 additions and 121 deletions

View File

@ -13,7 +13,7 @@ jobs:
continue-on-error: true continue-on-error: true
strategy: strategy:
matrix: matrix:
os: [ windows-2022, ubuntu-22.04, macos-13 ] os: [ windows-2022, ubuntu-22.04, macos-13, windows-2022-debug ]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View File

@ -38,6 +38,19 @@
"CMAKE_BUILD_TYPE": "RelWithDebInfo" "CMAKE_BUILD_TYPE": "RelWithDebInfo"
} }
}, },
{
"name": "ci-windows-2022-debug",
"displayName": "CI configure step for Windows",
"description": "Set architecture to 64-bit (b/c RakNet)",
"inherits": "default",
"generator": "Visual Studio 17 2022",
"architecture": {
"value": "x64"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{ {
"name": "windows-default", "name": "windows-default",
"inherits": "ci-windows-2022", "inherits": "ci-windows-2022",
@ -66,6 +79,14 @@
"configuration": "RelWithDebInfo", "configuration": "RelWithDebInfo",
"jobs": 2 "jobs": 2
}, },
{
"name": "ci-windows-2022-debug",
"configurePreset": "ci-windows-2022-debug",
"displayName": "Windows CI Build",
"description": "This preset is used by the CI build on windows for debug",
"configuration": "Debug",
"jobs": 2
},
{ {
"name": "ci-ubuntu-22.04", "name": "ci-ubuntu-22.04",
"configurePreset": "ci-ubuntu-22.04", "configurePreset": "ci-ubuntu-22.04",
@ -123,6 +144,24 @@
"name": "((example)|(minigzip))+" "name": "((example)|(minigzip))+"
} }
} }
},
{
"name": "ci-windows-2022-debug",
"configurePreset": "ci-windows-2022-debug",
"displayName": "CI Tests on windows",
"description": "Runs all tests on a windows configuration for debug",
"configuration": "Debug",
"execution": {
"jobs": 2
},
"output": {
"outputOnFailure": true
},
"filter": {
"exclude": {
"name": "((example)|(minigzip))+"
}
}
} }
] ]
} }

View File

@ -15,6 +15,9 @@ endif()
add_custom_target(conncpp_tests add_custom_target(conncpp_tests
${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) ${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
add_custom_target(zlib_tests
${CMAKE_COMMAND} -E copy $<TARGET_FILE:zlib> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
# Add the subdirectories # Add the subdirectories
add_subdirectory(dCommonTests) add_subdirectory(dCommonTests)
add_subdirectory(dGameTests) add_subdirectory(dGameTests)

View File

@ -17,7 +17,7 @@ list(APPEND DCOMMONTEST_SOURCES ${DENUMS_TESTS})
# Set our executable # Set our executable
add_executable(dCommonTests ${DCOMMONTEST_SOURCES}) add_executable(dCommonTests ${DCOMMONTEST_SOURCES})
add_dependencies(dCommonTests conncpp_tests) add_dependencies(dCommonTests conncpp_tests zlib_tests)
# Apple needs some special linkage for the mariadb connector for tests. # Apple needs some special linkage for the mariadb connector for tests.
if(APPLE) if(APPLE)