ci: Ignore GCC-11 on Ubuntu 22, and fix some missing CMake flags
This commit is contained in:
parent
2478bb4308
commit
b6ea9b3c5a
|
@ -118,6 +118,7 @@ jobs:
|
||||||
cmake \
|
cmake \
|
||||||
-S "${{ github.workspace }}/third-party/obs-studio" \
|
-S "${{ github.workspace }}/third-party/obs-studio" \
|
||||||
-B "${{ github.workspace }}/build/obs" \
|
-B "${{ github.workspace }}/build/obs" \
|
||||||
|
-DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" \
|
||||||
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/obs/install" \
|
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/obs/install" \
|
||||||
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obsdeps;${{ github.workspace }}/build/qt" \
|
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obsdeps;${{ github.workspace }}/build/qt" \
|
||||||
-DENABLE_PLUGINS=OFF \
|
-DENABLE_PLUGINS=OFF \
|
||||||
|
@ -138,11 +139,12 @@ jobs:
|
||||||
cmake \
|
cmake \
|
||||||
-S "${{ github.workspace }}" \
|
-S "${{ github.workspace }}" \
|
||||||
-B "${{ github.workspace }}/build/ci" \
|
-B "${{ github.workspace }}/build/ci" \
|
||||||
|
-DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" \
|
||||||
|
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
||||||
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
|
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
|
||||||
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
|
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
|
||||||
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
|
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
|
||||||
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obs/install;${{ github.workspace }}/build/qt;${{ github.workspace }}/build/obsdeps" \
|
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obs/install;${{ github.workspace }}/build/qt;${{ github.workspace }}/build/obsdeps"
|
||||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
|
|
||||||
- name: "Build: Debug"
|
- name: "Build: Debug"
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
shell: bash
|
shell: bash
|
||||||
|
@ -283,11 +285,11 @@ jobs:
|
||||||
cmake \
|
cmake \
|
||||||
-S "${{ github.workspace }}" \
|
-S "${{ github.workspace }}" \
|
||||||
-B "${{ github.workspace }}/build/ci" \
|
-B "${{ github.workspace }}/build/ci" \
|
||||||
|
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
||||||
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
|
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
|
||||||
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
|
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
|
||||||
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
|
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
|
||||||
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obs/install;${{ github.workspace }}/build/qt;${{ github.workspace }}/build/obsdeps" \
|
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obs/install;${{ github.workspace }}/build/qt;${{ github.workspace }}/build/obsdeps"
|
||||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
|
|
||||||
- name: "Build: Debug"
|
- name: "Build: Debug"
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
shell: bash
|
shell: bash
|
||||||
|
@ -328,6 +330,8 @@ jobs:
|
||||||
exclude:
|
exclude:
|
||||||
- runner: "ubuntu-22.04"
|
- runner: "ubuntu-22.04"
|
||||||
qt: 5
|
qt: 5
|
||||||
|
- runner: "ubuntu-22.04"
|
||||||
|
compiler: "GCC-11"
|
||||||
- runner: "ubuntu-20.04"
|
- runner: "ubuntu-20.04"
|
||||||
qt: 6
|
qt: 6
|
||||||
- runner: "ubuntu-20.04"
|
- runner: "ubuntu-20.04"
|
||||||
|
@ -437,6 +441,10 @@ jobs:
|
||||||
-B "${{ github.workspace }}/build/obs" \
|
-B "${{ github.workspace }}/build/obs" \
|
||||||
-G "Unix Makefiles" \
|
-G "Unix Makefiles" \
|
||||||
-DCMAKE_BUILD_TYPE="Release" \
|
-DCMAKE_BUILD_TYPE="Release" \
|
||||||
|
-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_INSTALL_PREFIX="${{ github.workspace }}/build/obs/install" \
|
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/obs/install" \
|
||||||
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obsdeps;${{ github.workspace }}/build/qt" \
|
-DCMAKE_PREFIX_PATH="${{ github.workspace }}/build/obsdeps;${{ github.workspace }}/build/qt" \
|
||||||
-DENABLE_PLUGINS=OFF \
|
-DENABLE_PLUGINS=OFF \
|
||||||
|
@ -457,11 +465,15 @@ jobs:
|
||||||
cmake \
|
cmake \
|
||||||
-S "${{ github.workspace }}" \
|
-S "${{ github.workspace }}" \
|
||||||
-B "${{ github.workspace }}/build/ci" \
|
-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" \
|
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
|
||||||
-DPACKAGE_NAME="streamfx-${{ env.PACKAGE_NAME }}" \
|
-DPACKAGE_NAME="streamfx-${{ env.PACKAGE_NAME }}" \
|
||||||
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
|
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
|
||||||
-Dlibobs_DIR="${{ github.workspace }}/build/obs/install" \
|
-Dlibobs_DIR="${{ github.workspace }}/build/obs/install"
|
||||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
|
|
||||||
- name: "Build: Debug"
|
- name: "Build: Debug"
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
Loading…
Reference in New Issue