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

Commit

Permalink
[CI] Update Windows CI (#476)
Browse files Browse the repository at this point in the history
  • Loading branch information
espkk committed Apr 5, 2023
1 parent d71617e commit ee274cc
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 51 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @espkk aka kb31 as a baseline owner
# @ugeen4 @np-c0mp1ete @mitrokosta / BlackMark
# @ugeen4 @q4a / BlackMark
# @Hammie / PiratesAhoy
* @espkk @ugeen4 @np-c0mp1ete @mitrokosta @Hammie
* @espkk @ugeen4 @q4a @Hammie
36 changes: 14 additions & 22 deletions .github/workflows/ci_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,44 +19,36 @@ jobs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
- id: skip_check
uses: fkirc/skip-duplicate-actions@v3.4.1
uses: fkirc/skip-duplicate-actions@v5
with:
# skip concurrent jobs if they are on the same thing
concurrent_skipping: 'same_content'
# never skip PR, release or manual/scheduled runs
do_not_skip: '["pull_request", "release", "workflow_dispatch", "schedule"]'

build-windows:
needs: pre_job
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
runs-on: windows-2019
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
configuration: [msvc-debug, msvc-release]
enable_steam: [false]
include:
- enable_steam: true
configuration: msvc-release
name: 'windows [${{ matrix.configuration}}, steam: ${{ matrix.enable_steam }}]'
configuration: [debug, release]
name: 'Windows [${{ matrix.configuration }}]'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: 'recursive'
- uses: ilammy/msvc-dev-cmd@v1
- name: Install Conan
run: pip install conan==1.59.0
- name: Configure with CMakeSettings.json and build
uses: lukka/run-cmake@v3
- name: Configure and build
uses: lukka/run-cmake@v10
with:
cmakeListsOrSettingsJson: CMakeSettingsJson
cmakeSettingsJsonPath: '${{ github.workspace }}/CMakeSettings.json'
useVcpkgToolchainFile: false
buildDirectory: '${{ github.workspace }}/build'
configurationRegexFilter: '${{ matrix.configuration }}'
cmakeAppendedArgs: '-DSTORM_ENABLE_STEAM=${{ matrix.enable_steam }} -DSTORM_ENABLE_CRASH_REPORTS=ON'
configurePreset: default
buildPreset: '${{ matrix.configuration }}'
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: storm-engine.${{ matrix.configuration }}-steam-${{ matrix.enable_steam}}
path: build\${{ matrix.configuration }}\bin
name: storm-engine.${{ matrix.configuration }}
path: build/default/${{ matrix.configuration }}

permissions: write-all
27 changes: 27 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 19,
"patch": 0
},
"configurePresets": [
{
"name": "default",
"generator": "Ninja Multi-Config",
"binaryDir": "${sourceDir}/build/${presetName}"
}
],
"buildPresets": [
{
"name": "debug",
"configurePreset": "default",
"configuration": "Debug"
},
{
"name": "release",
"configurePreset": "default",
"configuration": "Release"
}
]
}
26 changes: 0 additions & 26 deletions CMakeSettings.json

This file was deleted.

2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class StormEngine(ConanFile):

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

0 comments on commit ee274cc

Please sign in to comment.