mirror of
https://github.com/ModOrganizer2/mob.git
synced 2026-07-27 14:07:05 -07:00
Update CI to use VS2026.
This commit is contained in:
@@ -11,7 +11,7 @@ env:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: windows-2022
|
||||
runs-on: windows-2025-vs2026
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- name: Build Mob
|
||||
|
||||
+4
-22
@@ -2,8 +2,8 @@
|
||||
"version": 6,
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "vcpkg",
|
||||
"generator": "Visual Studio 17 2022",
|
||||
"name": "vs2026-windows",
|
||||
"generator": "Visual Studio 18 2026",
|
||||
"architecture": "x64",
|
||||
"binaryDir": "${sourceDir}/build/",
|
||||
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||
@@ -15,32 +15,14 @@
|
||||
],
|
||||
"buildPresets": [
|
||||
{
|
||||
"name": "Base",
|
||||
"hidden": true,
|
||||
"name": "vs2026-windows",
|
||||
"configurePreset": "vs2026-windows",
|
||||
"nativeToolOptions": [
|
||||
"-m",
|
||||
"-noLogo",
|
||||
"-p:UseMultiToolTask=true",
|
||||
"-p:EnforceProcessCountAcrossBuilds=true"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Debug",
|
||||
"configurePreset": "vcpkg",
|
||||
"inherits": "Base",
|
||||
"configuration": "Debug"
|
||||
},
|
||||
{
|
||||
"name": "Release",
|
||||
"configurePreset": "vcpkg",
|
||||
"inherits": "Base",
|
||||
"configuration": "Release"
|
||||
},
|
||||
{
|
||||
"name": "RelWithDebInfo",
|
||||
"configurePreset": "vcpkg",
|
||||
"inherits": "Base",
|
||||
"configuration": "RelWithDebInfo"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
+3
-3
@@ -13,13 +13,13 @@ if (!$root) {
|
||||
|
||||
$logLevel = if ($Verbose) { "STATUS" } else { "ERROR" }
|
||||
|
||||
cmake --preset vcpkg --log-level=$logLevel
|
||||
cmake --preset vs2026-windows --log-level=$logLevel
|
||||
|
||||
if ($Verbose) {
|
||||
cmake --build --preset $Config --verbose
|
||||
cmake --build --preset vs2026-windows --config $Config --verbose
|
||||
}
|
||||
else {
|
||||
cmake --build --preset $Config
|
||||
cmake --build --preset vs2026-windows --config $Config
|
||||
}
|
||||
|
||||
if (! $?) {
|
||||
|
||||
Reference in New Issue
Block a user