Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit ee274cc

Browse files
authored
[CI] Update Windows CI (#476)
1 parent d71617e commit ee274cc

File tree

5 files changed

+44
-51
lines changed

5 files changed

+44
-51
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# @espkk aka kb31 as a baseline owner
2-
# @ugeen4 @np-c0mp1ete @mitrokosta / BlackMark
2+
# @ugeen4 @q4a / BlackMark
33
# @Hammie / PiratesAhoy
4-
* @espkk @ugeen4 @np-c0mp1ete @mitrokosta @Hammie
4+
* @espkk @ugeen4 @q4a @Hammie

.github/workflows/ci_windows.yml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,44 +19,36 @@ jobs:
1919
should_skip: ${{ steps.skip_check.outputs.should_skip }}
2020
steps:
2121
- id: skip_check
22-
uses: fkirc/skip-duplicate-actions@v3.4.1
22+
uses: fkirc/skip-duplicate-actions@v5
2323
with:
24-
# skip concurrent jobs if they are on the same thing
2524
concurrent_skipping: 'same_content'
26-
# never skip PR, release or manual/scheduled runs
2725
do_not_skip: '["pull_request", "release", "workflow_dispatch", "schedule"]'
2826

2927
build-windows:
3028
needs: pre_job
3129
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
32-
runs-on: windows-2019
30+
runs-on: windows-latest
3331
strategy:
3432
fail-fast: false
3533
matrix:
36-
configuration: [msvc-debug, msvc-release]
37-
enable_steam: [false]
38-
include:
39-
- enable_steam: true
40-
configuration: msvc-release
41-
name: 'windows [${{ matrix.configuration}}, steam: ${{ matrix.enable_steam }}]'
34+
configuration: [debug, release]
35+
name: 'Windows [${{ matrix.configuration }}]'
4236
steps:
43-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v3
4438
with:
4539
submodules: 'recursive'
4640
- uses: ilammy/msvc-dev-cmd@v1
4741
- name: Install Conan
4842
run: pip install conan==1.59.0
49-
- name: Configure with CMakeSettings.json and build
50-
uses: lukka/run-cmake@v3
43+
- name: Configure and build
44+
uses: lukka/run-cmake@v10
5145
with:
52-
cmakeListsOrSettingsJson: CMakeSettingsJson
53-
cmakeSettingsJsonPath: '${{ github.workspace }}/CMakeSettings.json'
54-
useVcpkgToolchainFile: false
55-
buildDirectory: '${{ github.workspace }}/build'
56-
configurationRegexFilter: '${{ matrix.configuration }}'
57-
cmakeAppendedArgs: '-DSTORM_ENABLE_STEAM=${{ matrix.enable_steam }} -DSTORM_ENABLE_CRASH_REPORTS=ON'
46+
configurePreset: default
47+
buildPreset: '${{ matrix.configuration }}'
5848
- name: Upload artifact
59-
uses: actions/upload-artifact@v2
49+
uses: actions/upload-artifact@v3
6050
with:
61-
name: storm-engine.${{ matrix.configuration }}-steam-${{ matrix.enable_steam}}
62-
path: build\${{ matrix.configuration }}\bin
51+
name: storm-engine.${{ matrix.configuration }}
52+
path: build/default/${{ matrix.configuration }}
53+
54+
permissions: write-all

CMakePresets.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": 3,
3+
"cmakeMinimumRequired": {
4+
"major": 3,
5+
"minor": 19,
6+
"patch": 0
7+
},
8+
"configurePresets": [
9+
{
10+
"name": "default",
11+
"generator": "Ninja Multi-Config",
12+
"binaryDir": "${sourceDir}/build/${presetName}"
13+
}
14+
],
15+
"buildPresets": [
16+
{
17+
"name": "debug",
18+
"configurePreset": "default",
19+
"configuration": "Debug"
20+
},
21+
{
22+
"name": "release",
23+
"configurePreset": "default",
24+
"configuration": "Release"
25+
}
26+
]
27+
}

CMakeSettings.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class StormEngine(ConanFile):
1717

1818
# dependencies used in deploy binaries
1919
# conan-center
20-
requires = ["zlib/1.2.11", "spdlog/1.9.2", "fast_float/3.4.0", "mimalloc/2.0.3", "sentry-native/0.5.0",
20+
requires = ["zlib/1.2.13", "spdlog/1.9.2", "fast_float/3.4.0", "mimalloc/2.0.3", "sentry-native/0.5.0",
2121
# storm.jfrog.io
2222
"directx/9.0@storm/prebuilt", "fmod/2.02.05@storm/prebuilt"]
2323
# aux dependencies (e.g. for tests)

0 commit comments

Comments
 (0)