mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-25 23:17:28 +00:00
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
parent
102e3556cf
commit
e0b54645dc
2
.github/workflows/build-and-test.yml
vendored
2
.github/workflows/build-and-test.yml
vendored
@ -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
|
||||||
|
|||||||
@ -5,124 +5,163 @@
|
|||||||
"minor": 14,
|
"minor": 14,
|
||||||
"patch": 0
|
"patch": 0
|
||||||
},
|
},
|
||||||
"configurePresets": [
|
"configurePresets": [
|
||||||
{
|
{
|
||||||
"name": "default",
|
"name": "default",
|
||||||
"displayName": "Default configure step",
|
"displayName": "Default configure step",
|
||||||
"description": "Use 'build' dir and Unix makefiles",
|
"description": "Use 'build' dir and Unix makefiles",
|
||||||
"binaryDir": "${sourceDir}/build",
|
"binaryDir": "${sourceDir}/build",
|
||||||
"generator": "Unix Makefiles"
|
"generator": "Unix Makefiles"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ci-ubuntu-22.04",
|
"name": "ci-ubuntu-22.04",
|
||||||
"displayName": "CI configure step for Ubuntu",
|
"displayName": "CI configure step for Ubuntu",
|
||||||
"description": "Same as default, Used in GitHub actions workflow",
|
"description": "Same as default, Used in GitHub actions workflow",
|
||||||
"inherits": "default"
|
"inherits": "default"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ci-macos-13",
|
"name": "ci-macos-13",
|
||||||
"displayName": "CI configure step for MacOS",
|
"displayName": "CI configure step for MacOS",
|
||||||
"description": "Same as default, Used in GitHub actions workflow",
|
"description": "Same as default, Used in GitHub actions workflow",
|
||||||
"inherits": "default"
|
"inherits": "default"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ci-windows-2022",
|
"name": "ci-windows-2022",
|
||||||
"displayName": "CI configure step for Windows",
|
"displayName": "CI configure step for Windows",
|
||||||
"description": "Set architecture to 64-bit (b/c RakNet)",
|
"description": "Set architecture to 64-bit (b/c RakNet)",
|
||||||
"inherits": "default",
|
"inherits": "default",
|
||||||
"generator": "Visual Studio 17 2022",
|
"generator": "Visual Studio 17 2022",
|
||||||
"architecture": {
|
"architecture": {
|
||||||
"value": "x64"
|
"value": "x64"
|
||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "windows-default",
|
"name": "ci-windows-2022-debug",
|
||||||
"inherits": "ci-windows-2022",
|
"displayName": "CI configure step for Windows",
|
||||||
"displayName": "Windows only Configure Settings",
|
"description": "Set architecture to 64-bit (b/c RakNet)",
|
||||||
"description": "Sets build and install directories",
|
"inherits": "default",
|
||||||
"generator": "Ninja",
|
"generator": "Visual Studio 17 2022",
|
||||||
"architecture": {
|
"architecture": {
|
||||||
"value": "x64",
|
"value": "x64"
|
||||||
"strategy": "external"
|
},
|
||||||
}
|
"cacheVariables": {
|
||||||
}
|
"CMAKE_BUILD_TYPE": "Debug"
|
||||||
],
|
}
|
||||||
"buildPresets": [
|
},
|
||||||
{
|
{
|
||||||
"name": "default",
|
"name": "windows-default",
|
||||||
"configurePreset": "default",
|
"inherits": "ci-windows-2022",
|
||||||
"displayName": "Default Build",
|
"displayName": "Windows only Configure Settings",
|
||||||
"description": "Default Build",
|
"description": "Sets build and install directories",
|
||||||
"jobs": 2
|
"generator": "Ninja",
|
||||||
},
|
"architecture": {
|
||||||
{
|
"value": "x64",
|
||||||
"name": "ci-windows-2022",
|
"strategy": "external"
|
||||||
"configurePreset": "ci-windows-2022",
|
}
|
||||||
"displayName": "Windows CI Build",
|
}
|
||||||
"description": "This preset is used by the CI build on windows",
|
],
|
||||||
"configuration": "RelWithDebInfo",
|
"buildPresets": [
|
||||||
"jobs": 2
|
{
|
||||||
},
|
"name": "default",
|
||||||
{
|
"configurePreset": "default",
|
||||||
"name": "ci-ubuntu-22.04",
|
"displayName": "Default Build",
|
||||||
"configurePreset": "ci-ubuntu-22.04",
|
"description": "Default Build",
|
||||||
"displayName": "Linux CI Build",
|
"jobs": 2
|
||||||
"description": "This preset is used by the CI build on linux",
|
},
|
||||||
"jobs": 2
|
{
|
||||||
},
|
"name": "ci-windows-2022",
|
||||||
{
|
"configurePreset": "ci-windows-2022",
|
||||||
"name": "ci-macos-13",
|
"displayName": "Windows CI Build",
|
||||||
"configurePreset": "ci-macos-13",
|
"description": "This preset is used by the CI build on windows",
|
||||||
"displayName": "MacOS CI Build",
|
"configuration": "RelWithDebInfo",
|
||||||
"description": "This preset is used by the CI build on MacOS",
|
"jobs": 2
|
||||||
"jobs": 2
|
},
|
||||||
}
|
{
|
||||||
],
|
"name": "ci-windows-2022-debug",
|
||||||
"testPresets": [
|
"configurePreset": "ci-windows-2022-debug",
|
||||||
{
|
"displayName": "Windows CI Build",
|
||||||
"name": "ci-ubuntu-22.04",
|
"description": "This preset is used by the CI build on windows for debug",
|
||||||
"configurePreset": "ci-ubuntu-22.04",
|
"configuration": "Debug",
|
||||||
"displayName": "CI Tests on Linux",
|
"jobs": 2
|
||||||
"description": "Runs all tests on a linux configuration",
|
},
|
||||||
"execution": {
|
{
|
||||||
"jobs": 2
|
"name": "ci-ubuntu-22.04",
|
||||||
},
|
"configurePreset": "ci-ubuntu-22.04",
|
||||||
"output": {
|
"displayName": "Linux CI Build",
|
||||||
"outputOnFailure": true
|
"description": "This preset is used by the CI build on linux",
|
||||||
}
|
"jobs": 2
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ci-macos-13",
|
"name": "ci-macos-13",
|
||||||
"configurePreset": "ci-macos-13",
|
"configurePreset": "ci-macos-13",
|
||||||
"displayName": "CI Tests on MacOS",
|
"displayName": "MacOS CI Build",
|
||||||
"description": "Runs all tests on a Mac configuration",
|
"description": "This preset is used by the CI build on MacOS",
|
||||||
"execution": {
|
"jobs": 2
|
||||||
"jobs": 2
|
}
|
||||||
},
|
],
|
||||||
"output": {
|
"testPresets": [
|
||||||
"outputOnFailure": true
|
{
|
||||||
}
|
"name": "ci-ubuntu-22.04",
|
||||||
},
|
"configurePreset": "ci-ubuntu-22.04",
|
||||||
{
|
"displayName": "CI Tests on Linux",
|
||||||
"name": "ci-windows-2022",
|
"description": "Runs all tests on a linux configuration",
|
||||||
"configurePreset": "ci-windows-2022",
|
"execution": {
|
||||||
"displayName": "CI Tests on windows",
|
"jobs": 2
|
||||||
"description": "Runs all tests on a windows configuration",
|
},
|
||||||
"configuration": "RelWithDebInfo",
|
"output": {
|
||||||
"execution": {
|
"outputOnFailure": true
|
||||||
"jobs": 2
|
}
|
||||||
},
|
},
|
||||||
"output": {
|
{
|
||||||
"outputOnFailure": true
|
"name": "ci-macos-13",
|
||||||
},
|
"configurePreset": "ci-macos-13",
|
||||||
"filter": {
|
"displayName": "CI Tests on MacOS",
|
||||||
"exclude": {
|
"description": "Runs all tests on a Mac configuration",
|
||||||
"name": "((example)|(minigzip))+"
|
"execution": {
|
||||||
}
|
"jobs": 2
|
||||||
|
},
|
||||||
|
"output": {
|
||||||
|
"outputOnFailure": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ci-windows-2022",
|
||||||
|
"configurePreset": "ci-windows-2022",
|
||||||
|
"displayName": "CI Tests on windows",
|
||||||
|
"description": "Runs all tests on a windows configuration",
|
||||||
|
"configuration": "RelWithDebInfo",
|
||||||
|
"execution": {
|
||||||
|
"jobs": 2
|
||||||
|
},
|
||||||
|
"output": {
|
||||||
|
"outputOnFailure": true
|
||||||
|
},
|
||||||
|
"filter": {
|
||||||
|
"exclude": {
|
||||||
|
"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))+"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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)
|
||||||
|
|||||||
@ -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)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user