RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Fix CI failure

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-14 03:11:37 +02:00 committed by Xaymar
parent b344ec4dd9
commit b5a4adb8fb
1 changed files with 3 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,12 +32,10 @@ jobs:
qt: [ 6 ] qt: [ 6 ]
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"
@ -151,9 +149,6 @@ jobs:
-B "${{ github.workspace }}/build/ci" \ -B "${{ github.workspace }}/build/ci" \
-DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" \ -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
-Dlibobs_DIR="${{ github.workspace }}/build/obs/install" \ -Dlibobs_DIR="${{ github.workspace }}/build/obs/install" \
-DQt${{ matrix.qt }}_DIR="${{ github.workspace }}/build/qt" \ -DQt${{ matrix.qt }}_DIR="${{ github.workspace }}/build/qt" \
-DFFmpeg_DIR="${{ github.workspace }}/build/obsdeps" \ -DFFmpeg_DIR="${{ github.workspace }}/build/obsdeps" \
@ -170,21 +165,7 @@ jobs:
env: env:
CMAKE_BUILD_TYPE: "RelWithDebInfo" CMAKE_BUILD_TYPE: "RelWithDebInfo"
run: | run: |
cmake --build "build/ci" --config ${{ env.CMAKE_BUILD_TYPE }} --target install cmake --build "build/ci" --config ${{ env.CMAKE_BUILD_TYPE }} --target StreamFX
- name: "Packaging: Install InnoSetup"
if: startsWith( matrix.runner, 'windows' )
run: |
curl "-kL" "https://cdn.xaymar.com/ci/innosetup-6.2.1.exe" "-f" "--retry" "5" "-o" "inno.exe"
.\inno.exe /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
- name: "Packaging"
shell: cmd
run: |
"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /V10 ".\build\ci\installer.iss"
- name: "Artifacts"
uses: actions/upload-artifact@v1
with:
name: "${{ matrix.runner }}-${{ matrix.compiler }}-qt${{ matrix.qt }}"
path: "${{ github.workspace }}/build/package"
macos: macos:
strategy: strategy:
@ -196,7 +177,6 @@ jobs:
include: include:
- compiler: "Clang" - compiler: "Clang"
name: "MacOS" 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"
@ -309,9 +289,6 @@ jobs:
-S "${{ github.workspace }}" \ -S "${{ github.workspace }}" \
-B "${{ github.workspace }}/build/ci" \ -B "${{ github.workspace }}/build/ci" \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
-Dlibobs_DIR="${{ github.workspace }}/build/obs/install" \ -Dlibobs_DIR="${{ github.workspace }}/build/obs/install" \
-DQt${{ matrix.qt }}_DIR="${{ github.workspace }}/build/qt" \ -DQt${{ matrix.qt }}_DIR="${{ github.workspace }}/build/qt" \
-DFFmpeg_DIR="${{ github.workspace }}/build/obsdeps" \ -DFFmpeg_DIR="${{ github.workspace }}/build/obsdeps" \
@ -326,24 +303,7 @@ jobs:
env: env:
CMAKE_BUILD_TYPE: "RelWithDebInfo" CMAKE_BUILD_TYPE: "RelWithDebInfo"
run: | run: |
cmake --build "build/ci" --config RelWithDebInfo --target install cmake --build "build/ci" --config RelWithDebInfo --target StreamFX
- name: 'Packaging: Install Packages'
if: startsWith( matrix.runner, 'macos' )
shell: bash
run: |
curl -kL https://cdn.xaymar.com/ci/Packages-1.2.10.dmg -f --retry 5 -o "Packages.dmg"
sudo hdiutil attach ./Packages.dmg
pushd /Volumes/Packages*
sudo installer -pkg ./Install\ Packages.pkg -target /
- name: "Packaging"
shell: cmd
run: |
"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /V10 ".\build\ci\installer.iss"
- name: "Artifacts"
uses: actions/upload-artifact@v1
with:
name: "${{ matrix.runner }}-${{ matrix.compiler }}-qt${{ matrix.qt }}"
path: "${{ github.workspace }}/build/package"
ubuntu: ubuntu:
strategy: strategy:
@ -365,10 +325,8 @@ jobs:
include: include:
- runner: "ubuntu-22.04" - runner: "ubuntu-22.04"
name: "Ubuntu 22.04" name: "Ubuntu 22.04"
package_name: "ubuntu22.04-qt6"
- runner: "ubuntu-20.04" - runner: "ubuntu-20.04"
name: "Ubuntu 20.04" name: "Ubuntu 20.04"
package_name: "ubuntu20.04-qt5"
runs-on: "${{ matrix.runner }}" runs-on: "${{ matrix.runner }}"
name: "${{ matrix.name }} (${{ matrix.compiler }}, Qt${{ matrix.qt }})" name: "${{ matrix.name }} (${{ matrix.compiler }}, Qt${{ matrix.qt }})"
env: env:
@ -376,7 +334,6 @@ jobs:
CMAKE_GENERATOR_PLATFORM: "${{ matrix.CMAKE_GENERATOR_PLATFORM }}" CMAKE_GENERATOR_PLATFORM: "${{ matrix.CMAKE_GENERATOR_PLATFORM }}"
CMAKE_GENERATOR_TOOLSET: "${{ matrix.CMAKE_GENERATOR_TOOLSET }}" CMAKE_GENERATOR_TOOLSET: "${{ matrix.CMAKE_GENERATOR_TOOLSET }}"
CMAKE_SYSTEM_VERSION: "${{ matrix.CMAKE_SYSTEM_VERSION }}" CMAKE_SYSTEM_VERSION: "${{ matrix.CMAKE_SYSTEM_VERSION }}"
PACKAGE_NAME: "streamfx-${{ matrix.package_name }}"
steps: steps:
- name: "Clone" - name: "Clone"
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -417,9 +374,6 @@ jobs:
echo "Unknown Compiler" echo "Unknown Compiler"
exit 1 exit 1
fi fi
# Adjust package name
echo "PACKAGE_NAME=${{ env.PACKAGE_NAME }}-${compiler[0]}${compiler[1]}" >> "$GITHUB_ENV"
- name: "Dependency: Qt" - name: "Dependency: Qt"
id: qt id: qt
shell: bash shell: bash
@ -500,8 +454,6 @@ jobs:
-B "${{ github.workspace }}/build/ci" \ -B "${{ github.workspace }}/build/ci" \
-DCMAKE_C_COMPILER="${{ env.CMAKE_C_COMPILER }}" \ -DCMAKE_C_COMPILER="${{ env.CMAKE_C_COMPILER }}" \
-DCMAKE_CXX_COMPILER="${{ env.CMAKE_CXX_COMPILER }}" \ -DCMAKE_CXX_COMPILER="${{ env.CMAKE_CXX_COMPILER }}" \
-DCMAKE_C_FLAGS="${{ env.CMAKE_C_FLAGS }}" \
-DCMAKE_CXX_FLAGS="${{ env.CMAKE_CXX_FLAGS }}" \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \ -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
-DPACKAGE_NAME="streamfx-${{ env.PACKAGE_NAME }}" \ -DPACKAGE_NAME="streamfx-${{ env.PACKAGE_NAME }}" \
@ -515,14 +467,4 @@ jobs:
- name: "Build: Release" - name: "Build: Release"
shell: bash shell: bash
run: | run: |
cmake --build "build/ci" --config RelWithDebInfo --target install/strip cmake --build "build/ci" --config RelWithDebInfo --target StreamFX
- name: "Packaging"
shell: bash
run: |
mkdir "${{ github.workspace }}/build/package"
cmake --build "${{ github.workspace }}/build/ci" --config RelWithDebInfo --target PACKAGE_7Z
- name: "Artifacts"
uses: actions/upload-artifact@v1
with:
name: "${{ matrix.runner }}-${{ matrix.compiler }}-qt${{ matrix.qt }}"
path: "${{ github.workspace }}/build/package"