Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 13:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pin to windows-2022

Browse Source
This commit is contained in:
Xiphoseer 2022-01-05 14:21:59 +01:00
parent adab6cf96f
commit 5e7566c89a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-and-test.yml vendored
View File

@ -12,14 +12,14 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ windows-latest, ubuntu-latest ] os: [ windows-2022, ubuntu-latest ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: true submodules: true
- name: Add msbuild to PATH (windows only) - name: Add msbuild to PATH (windows only)
if: ${{ matrix.os == 'windows-latest' }} if: ${{ matrix.os == 'windows-2022' }}
uses: microsoft/setup-msbuild@v1.1 uses: microsoft/setup-msbuild@v1.1
with: with:
vs-version: '[16,17)' vs-version: '[16,17)'

14
CMakePresets.json
View File

@ -20,11 +20,11 @@
"inherits": "default" "inherits": "default"
}, },
{ {
"name": "ci-windows-latest", "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 16 2019", "generator": "Visual Studio 17 2022",
"architecture": { "architecture": {
"value": "x64" "value": "x64"
}, },
@ -34,7 +34,7 @@
}, },
{ {
"name": "windows-default", "name": "windows-default",
"inherits": "ci-windows-latest", "inherits": "ci-windows-2022",
"displayName": "Windows only Configure Settings", "displayName": "Windows only Configure Settings",
"description": "Sets build and install directories", "description": "Sets build and install directories",
"generator": "Ninja", "generator": "Ninja",
@ -53,8 +53,8 @@
"jobs": 2 "jobs": 2
}, },
{ {
"name": "ci-windows-latest", "name": "ci-windows-2022",
"configurePreset": "ci-windows-latest", "configurePreset": "ci-windows-2022",
"displayName": "Windows CI Build", "displayName": "Windows CI Build",
"description": "This preset is used by the CI build on windows", "description": "This preset is used by the CI build on windows",
"configuration": "RelWithDebInfo", "configuration": "RelWithDebInfo",
@ -82,8 +82,8 @@
} }
}, },
{ {
"name": "ci-windows-latest", "name": "ci-windows-2022",
"configurePreset": "ci-windows-latest", "configurePreset": "ci-windows-2022",
"displayName": "CI Tests on windows", "displayName": "CI Tests on windows",
"description": "Runs all tests on a windows configuration", "description": "Runs all tests on a windows configuration",
"configuration": "RelWithDebInfo", "configuration": "RelWithDebInfo",