attempted CI fix (feel free to revert)

This commit is contained in:
jadebenn 2024-12-08 16:42:41 -06:00
parent 628f6b4101
commit 4b99b984af

View File

@ -1,191 +1,219 @@
{ {
"version": 6, "version": 6,
"cmakeMinimumRequired": { "cmakeMinimumRequired": {
"major": 3, "major": 3,
"minor": 25, "minor": 25,
"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",
"hidden": true "hidden": true
}, },
{ {
"name": "windows-default", "name": "windows-default",
"inherits": "default", "inherits": "default",
"displayName": "Windows Default Configure Settings", "displayName": "Windows Default Configure Settings",
"description": "Sets build and install directories", "description": "Sets build and install directories",
"generator": "Visual Studio 17 2022", "generator": "Visual Studio 17 2022",
"condition": { "condition": {
"type": "equals", "type": "equals",
"lhs": "${hostSystemName}", "lhs": "${hostSystemName}",
"rhs": "Windows" "rhs": "Windows"
}, },
"hidden": true "hidden": true
}, },
{ {
"name": "windows-msvc", "name": "windows-msvc",
"inherits": "windows-default", "inherits": "windows-default",
"displayName": "Windows (MSVC)", "displayName": "Windows (MSVC)",
"description": "Create a build using MSVC" "description": "Create a build using MSVC"
}, },
{ {
"name": "windows-clang", "name": "windows-clang",
"inherits": "windows-default", "inherits": "windows-default",
"displayName": "EXPERIMENTAL - Windows (Clang)", "displayName": "EXPERIMENTAL - Windows (Clang)",
"description": "Create a build using Clang", "description": "Create a build using Clang",
"toolset": "ClangCL" "toolset": "ClangCL"
}, },
{ {
"name": "linux-default", "name": "linux-default",
"inherits": "default", "inherits": "default",
"hidden": true, "hidden": true,
"condition": { "condition": {
"type": "equals", "type": "equals",
"lhs": "${hostSystemName}", "lhs": "${hostSystemName}",
"rhs": "Linux" "rhs": "Linux"
} }
}, },
{ {
"name": "linux-clang", "name": "linux-clang",
"inherits": "linux-default", "inherits": "linux-default",
"toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake", "toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake",
"displayName": "Linux (Clang)", "displayName": "Linux (Clang)",
"description": "Create a build using the Clang toolchain for Linux" "description": "Create a build using the Clang toolchain for Linux"
}, },
{ {
"name": "linux-gnu", "name": "linux-gnu",
"inherits": "linux-default", "inherits": "linux-default",
"toolchainFile": "${sourceDir}/cmake/toolchains/linux-gnu.cmake", "toolchainFile": "${sourceDir}/cmake/toolchains/linux-gnu.cmake",
"displayName": "Linux (GNU)", "displayName": "Linux (GNU)",
"description": "Create a build using the GNU toolchain for Linux" "description": "Create a build using the GNU toolchain for Linux"
}, },
{ {
"name": "macos", "name": "macos",
"inherits": "default", "inherits": "default",
"displayName": "MacOS", "displayName": "MacOS",
"description": "Create a build for MacOS", "description": "Create a build for MacOS",
"condition": { "condition": {
"type": "equals", "type": "equals",
"lhs": "${hostSystemName}", "lhs": "${hostSystemName}",
"rhs": "Darwin" "rhs": "Darwin"
} }
} }
], ],
"buildPresets": [ "buildPresets": [
{ {
"name": "default", "name": "default",
"configurePreset": "default", "configurePreset": "default",
"displayName": "Default Build", "displayName": "Default Build",
"description": "Default Build", "description": "Default Build",
"jobs": 2 "jobs": 2
} },
], {
"testPresets": [ "name": "windows-msvc-debug",
{ "inherits": "default",
"name": "ci-ubuntu-22.04", "configurePreset": "windows-msvc",
"configurePreset": "linux-clang", "displayName": "Windows (MSVC)",
"displayName": "CI Tests on Linux", "description": "This preset is used to build using the MSVC toolchain on Windows"
"description": "Runs all tests on a linux configuration", },
"execution": { {
"jobs": 2 "name": "linux-clang",
}, "inherits": "default",
"output": { "configurePreset": "linux-clang",
"outputOnFailure": true "displayName": "Linux (Clang)",
} "description": "This preset is used to build using the Clang toolchain on Linux"
}, },
{ {
"name": "ci-macos-13", "name": "linux-gnu",
"configurePreset": "macos", "inherits": "default",
"displayName": "CI Tests on MacOS", "configurePreset": "linux-gnu",
"description": "Runs all tests on a Mac configuration", "displayName": "Linux (GNU)",
"execution": { "description": "This preset is used to build using the GNU toolchain on Linux"
"jobs": 2 },
}, {
"output": { "name": "macos",
"outputOnFailure": true "inherits": "default",
} "configurePreset": "macos",
}, "displayName": "MacOS",
{ "description": "This preset is used to build on MacOS"
"name": "ci-windows-2022", }
"configurePreset": "windows-msvc", ],
"displayName": "CI Tests on windows", "testPresets": [
"description": "Runs all tests on a windows configuration", {
"configuration": "RelWithDebInfo", "name": "ci-ubuntu-22.04",
"execution": { "configurePreset": "linux-clang",
"jobs": 2 "displayName": "CI Tests on Linux",
}, "description": "Runs all tests on a linux configuration",
"output": { "execution": {
"outputOnFailure": true "jobs": 2
}, },
"filter": { "output": {
"exclude": { "outputOnFailure": true
"name": "((example)|(minigzip))+" }
} },
} {
} "name": "ci-macos-13",
], "configurePreset": "macos",
"workflowPresets": [ "displayName": "CI Tests on MacOS",
{ "description": "Runs all tests on a Mac configuration",
"name": "ci-windows-2022", "execution": {
"displayName": "Windows (MSVC)", "jobs": 2
"description": "CI workflow preset for Windows", },
"steps": [ "output": {
{ "outputOnFailure": true
"type": "configure", }
"name": "windows-msvc" },
}, {
{ "name": "ci-windows-2022",
"type": "build", "configurePreset": "windows-msvc",
"name": "default" "displayName": "CI Tests on windows",
}, "description": "Runs all tests on a windows configuration",
{ "configuration": "RelWithDebInfo",
"type": "test", "execution": {
"name": "ci-windows-2022" "jobs": 2
} },
] "output": {
}, "outputOnFailure": true
{ },
"name": "ci-ubuntu-22.04", "filter": {
"displayName": "Linux (GNU)", "exclude": {
"description": "CI workflow preset for Ubuntu", "name": "((example)|(minigzip))+"
"steps": [ }
{ }
"type": "configure", }
"name": "linux-gnu" ],
}, "workflowPresets": [
{ {
"type": "build", "name": "ci-windows-2022",
"name": "default" "displayName": "Windows (MSVC)",
}, "description": "CI workflow preset for Windows",
{ "steps": [
"type": "test", {
"name": "ci-ubuntu-22.04" "type": "configure",
} "name": "windows-msvc"
] },
}, {
{ "type": "build",
"name": "ci-macos-13", "name": "windows-msvc"
"displayName": "MacOS (Clang)", },
"description": "CI workflow preset for MacOS", {
"steps": [ "type": "test",
{ "name": "ci-windows-2022"
"type": "configure", }
"name": "macos" ]
}, },
{ {
"type": "build", "name": "ci-ubuntu-22.04",
"name": "default" "displayName": "Linux (GNU)",
}, "description": "CI workflow preset for Ubuntu",
{ "steps": [
"type": "test", {
"name": "ci-macos-13" "type": "configure",
} "name": "linux-gnu"
] },
} {
] "type": "build",
"name": "linux-gnu"
},
{
"type": "test",
"name": "ci-ubuntu-22.04"
}
]
},
{
"name": "ci-macos-13",
"displayName": "MacOS (Clang)",
"description": "CI workflow preset for MacOS",
"steps": [
{
"type": "configure",
"name": "macos"
},
{
"type": "build",
"name": "macos"
},
{
"type": "test",
"name": "ci-macos-13"
}
]
}
]
} }