etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-17 22:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

ci: Fix some workflow errors introduced by the split

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-13 22:30:00 +02:00 committed by Xaymar
parent 0e1db7fad5
commit b662f32166
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,16 +26,17 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
runner: "windows-2022" runner: [ "windows-2022" ]
name: "Windows" name: [ "Windows" ]
package_name: "windows"
compiler: [ "MSVC", "Clang" ] compiler: [ "MSVC", "Clang" ]
include: include:
- compiler: "MSVC" - compiler: "MSVC"
package_name: "windows"
CMAKE_SYSTEM_VERSION: "10.0.20348.0" CMAKE_SYSTEM_VERSION: "10.0.20348.0"
CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64" CMAKE_GENERATOR_PLATFORM: "x64"
- compiler: "Clang" - compiler: "Clang"
package_name: "windows-clang"
CMAKE_SYSTEM_VERSION: "10.0.20348.0" CMAKE_SYSTEM_VERSION: "10.0.20348.0"
CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_TOOLSET: "ClangCL" CMAKE_GENERATOR_TOOLSET: "ClangCL"
@ -173,11 +174,11 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
runner: "macos-12" runner: "macos-12"
name: "MacOS"
package_name: "macos"
compiler: [ "Clang" ] compiler: [ "Clang" ]
include: include:
- compiler: "Clang" - compiler: "Clang"
name: "MacOS"
package_name: "macos"
CMAKE_GENERATOR: "Xcode" CMAKE_GENERATOR: "Xcode"
CMAKE_OSX_DEPLOYMENT_TARGET: "10.15" CMAKE_OSX_DEPLOYMENT_TARGET: "10.15"
CMAKE_OSX_ARCHITECTURES: "x86_64;arm64" CMAKE_OSX_ARCHITECTURES: "x86_64;arm64"
@ -317,8 +318,6 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
runner: [ "ubuntu-22.04", "ubuntu-20.04" ] runner: [ "ubuntu-22.04", "ubuntu-20.04" ]
name: "Ubuntu"
package_name: "windows"
compiler: [ "GCC", "Clang" ] compiler: [ "GCC", "Clang" ]
qt: [ 5, 6 ] qt: [ 5, 6 ]
exclude: exclude:
@ -329,6 +328,7 @@ jobs:
include: include:
- runner: "ubuntu-22.04" - runner: "ubuntu-22.04"
compiler: "GCC" compiler: "GCC"
qt: 6
name: "Ubuntu 22.04" name: "Ubuntu 22.04"
package_name: "ubuntu22.04-qt6" package_name: "ubuntu22.04-qt6"
CMAKE_GENERATOR: "Ninja" CMAKE_GENERATOR: "Ninja"
@ -336,6 +336,8 @@ jobs:
CMAKE_CXX_COMPILER: "g++-12" CMAKE_CXX_COMPILER: "g++-12"
CMAKE_LINKER_COMPILER: "ld" CMAKE_LINKER_COMPILER: "ld"
- runner: "ubuntu-22.04" - runner: "ubuntu-22.04"
compiler: "Clang"
qt: 6
name: "Ubuntu 22.04 (Clang)" name: "Ubuntu 22.04 (Clang)"
package_name: "ubuntu22.04-qt6-clang" package_name: "ubuntu22.04-qt6-clang"
CMAKE_GENERATOR: "Ninja" CMAKE_GENERATOR: "Ninja"
@ -344,6 +346,7 @@ jobs:
CMAKE_LINKER_COMPILER: "lld" CMAKE_LINKER_COMPILER: "lld"
- runner: "ubuntu-20.04" - runner: "ubuntu-20.04"
compiler: "GCC" compiler: "GCC"
qt: 5
name: "Ubuntu 20.04" name: "Ubuntu 20.04"
package_name: "ubuntu20.04-qt5" package_name: "ubuntu20.04-qt5"
CMAKE_GENERATOR: "Ninja" CMAKE_GENERATOR: "Ninja"
@ -351,6 +354,8 @@ jobs:
CMAKE_CXX_COMPILER: "g++-11" CMAKE_CXX_COMPILER: "g++-11"
CMAKE_LINKER_COMPILER: "ld" CMAKE_LINKER_COMPILER: "ld"
- runner: "ubuntu-20.04" - runner: "ubuntu-20.04"
compiler: "Clang"
qt: 5
name: "Ubuntu 20.04 (Clang)" name: "Ubuntu 20.04 (Clang)"
package_name: "ubuntu20.04-qt5-clang" package_name: "ubuntu20.04-qt5-clang"
CMAKE_GENERATOR: "Ninja" CMAKE_GENERATOR: "Ninja"