etc
/
obs-StreamFX
mirror of https://github.com/Xaymar/obs-StreamFX
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Match build matrix with OBS Studio build matrix

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-04-03 01:44:23 +02:00 committed by Michael Fabian Dirks
parent 0242514184
commit 89361db682
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/main.yml vendored
View File

@ -10,12 +10,12 @@ jobs:
runner: [ windows-2016, windows-2019 ] runner: [ windows-2016, windows-2019 ]
include: include:
- runner: windows-2016 - runner: windows-2016
id: windows-vs2017 id: windows2017
windows_sdk: "10.0.17763.0" windows_sdk: "10.0.17763.0"
cmake_generator: "Visual Studio 15 2017 Win64" cmake_generator: "Visual Studio 15 2017 Win64"
cmake_generator_platform: "" cmake_generator_platform: ""
- runner: windows-2019 - runner: windows-2019
id: windows-vs2019 id: windows2019
windows_sdk: "10.0.18362.0" windows_sdk: "10.0.18362.0"
cmake_generator: "Visual Studio 16 2019" cmake_generator: "Visual Studio 16 2019"
cmake_generator_platform: "x64" cmake_generator_platform: "x64"
@ -61,21 +61,14 @@ jobs:
name: "Linux/Ubuntu 64-bit" name: "Linux/Ubuntu 64-bit"
strategy: strategy:
matrix: matrix:
runner: [ ubuntu-16.04, ubuntu-18.04 ] runner: [ ubuntu-18.04, ubuntu-latest ]
gcc: [ 8, 9 ]
include: include:
- runner: ubuntu-16.04
gcc: 8
id: ubuntu1604-gcc8
- runner: ubuntu-16.04
gcc: 9
id: ubuntu1604-gcc9
- runner: ubuntu-18.04 - runner: ubuntu-18.04
gcc: 8 gcc: 8
id: ubuntu1804-gcc8 id: ubuntu1804
- runner: ubuntu-18.04 - runner: ubuntu-latest
gcc: 9 gcc: 9
id: ubuntu1804-gcc9 id: ubuntu1910
runs-on: ${{ matrix.runner }} runs-on: ${{ matrix.runner }}
env: env:
CMAKE_GENERATOR: "Ninja" CMAKE_GENERATOR: "Ninja"