mirror of https://github.com/Xaymar/obs-StreamFX
ci: Fix CI failure
This commit is contained in:
parent
b344ec4dd9
commit
b5a4adb8fb
|
@ -32,12 +32,10 @@ jobs:
|
|||
qt: [ 6 ]
|
||||
include:
|
||||
- compiler: "MSVC"
|
||||
package_name: "windows"
|
||||
CMAKE_SYSTEM_VERSION: "10.0.20348.0"
|
||||
CMAKE_GENERATOR: "Visual Studio 17 2022"
|
||||
CMAKE_GENERATOR_PLATFORM: "x64"
|
||||
- compiler: "Clang"
|
||||
package_name: "windows-clang"
|
||||
CMAKE_SYSTEM_VERSION: "10.0.20348.0"
|
||||
CMAKE_GENERATOR: "Visual Studio 17 2022"
|
||||
CMAKE_GENERATOR_TOOLSET: "ClangCL"
|
||||
|
@ -151,9 +149,6 @@ jobs:
|
|||
-B "${{ github.workspace }}/build/ci" \
|
||||
-DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" \
|
||||
-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" \
|
||||
-DQt${{ matrix.qt }}_DIR="${{ github.workspace }}/build/qt" \
|
||||
-DFFmpeg_DIR="${{ github.workspace }}/build/obsdeps" \
|
||||
|
@ -170,21 +165,7 @@ jobs:
|
|||
env:
|
||||
CMAKE_BUILD_TYPE: "RelWithDebInfo"
|
||||
run: |
|
||||
cmake --build "build/ci" --config ${{ env.CMAKE_BUILD_TYPE }} --target install
|
||||
- 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"
|
||||
cmake --build "build/ci" --config ${{ env.CMAKE_BUILD_TYPE }} --target StreamFX
|
||||
|
||||
macos:
|
||||
strategy:
|
||||
|
@ -196,7 +177,6 @@ jobs:
|
|||
include:
|
||||
- compiler: "Clang"
|
||||
name: "MacOS"
|
||||
package_name: "macos"
|
||||
CMAKE_GENERATOR: "Xcode"
|
||||
CMAKE_OSX_DEPLOYMENT_TARGET: "10.15"
|
||||
CMAKE_OSX_ARCHITECTURES: "x86_64;arm64"
|
||||
|
@ -309,9 +289,6 @@ jobs:
|
|||
-S "${{ github.workspace }}" \
|
||||
-B "${{ github.workspace }}/build/ci" \
|
||||
-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" \
|
||||
-DQt${{ matrix.qt }}_DIR="${{ github.workspace }}/build/qt" \
|
||||
-DFFmpeg_DIR="${{ github.workspace }}/build/obsdeps" \
|
||||
|
@ -326,24 +303,7 @@ jobs:
|
|||
env:
|
||||
CMAKE_BUILD_TYPE: "RelWithDebInfo"
|
||||
run: |
|
||||
cmake --build "build/ci" --config RelWithDebInfo --target install
|
||||
- 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"
|
||||
cmake --build "build/ci" --config RelWithDebInfo --target StreamFX
|
||||
|
||||
ubuntu:
|
||||
strategy:
|
||||
|
@ -365,10 +325,8 @@ jobs:
|
|||
include:
|
||||
- runner: "ubuntu-22.04"
|
||||
name: "Ubuntu 22.04"
|
||||
package_name: "ubuntu22.04-qt6"
|
||||
- runner: "ubuntu-20.04"
|
||||
name: "Ubuntu 20.04"
|
||||
package_name: "ubuntu20.04-qt5"
|
||||
runs-on: "${{ matrix.runner }}"
|
||||
name: "${{ matrix.name }} (${{ matrix.compiler }}, Qt${{ matrix.qt }})"
|
||||
env:
|
||||
|
@ -376,7 +334,6 @@ jobs:
|
|||
CMAKE_GENERATOR_PLATFORM: "${{ matrix.CMAKE_GENERATOR_PLATFORM }}"
|
||||
CMAKE_GENERATOR_TOOLSET: "${{ matrix.CMAKE_GENERATOR_TOOLSET }}"
|
||||
CMAKE_SYSTEM_VERSION: "${{ matrix.CMAKE_SYSTEM_VERSION }}"
|
||||
PACKAGE_NAME: "streamfx-${{ matrix.package_name }}"
|
||||
steps:
|
||||
- name: "Clone"
|
||||
uses: actions/checkout@v3
|
||||
|
@ -417,9 +374,6 @@ jobs:
|
|||
echo "Unknown Compiler"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Adjust package name
|
||||
echo "PACKAGE_NAME=${{ env.PACKAGE_NAME }}-${compiler[0]}${compiler[1]}" >> "$GITHUB_ENV"
|
||||
- name: "Dependency: Qt"
|
||||
id: qt
|
||||
shell: bash
|
||||
|
@ -500,8 +454,6 @@ jobs:
|
|||
-B "${{ github.workspace }}/build/ci" \
|
||||
-DCMAKE_C_COMPILER="${{ env.CMAKE_C_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_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
|
||||
-DPACKAGE_NAME="streamfx-${{ env.PACKAGE_NAME }}" \
|
||||
|
@ -515,14 +467,4 @@ jobs:
|
|||
- name: "Build: Release"
|
||||
shell: bash
|
||||
run: |
|
||||
cmake --build "build/ci" --config RelWithDebInfo --target install/strip
|
||||
- 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"
|
||||
cmake --build "build/ci" --config RelWithDebInfo --target StreamFX
|
||||
|
|
Loading…
Reference in New Issue