mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-28 14:23:01 +00:00
ci: Fix support for new CMake script
This commit is contained in:
parent
8163e3e917
commit
0862c7af06
2 changed files with 16 additions and 10 deletions
19
.github/workflows/main.yml
vendored
19
.github/workflows/main.yml
vendored
|
@ -45,7 +45,10 @@ jobs:
|
|||
- name: "Configure Project"
|
||||
shell: bash
|
||||
run: |
|
||||
cmake -H. -B"build/temp" -DCMAKE_INSTALL_PREFIX="build/distrib" -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" -DOBS_DOWNLOAD=ON
|
||||
cmake -H. -B"build/temp" \
|
||||
-DCMAKE_INSTALL_PREFIX="build/distrib" \
|
||||
-DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" \
|
||||
-DCMAKE_PACKAGE_PREFIX="build/package"
|
||||
- name: "Build Project"
|
||||
shell: bash
|
||||
run: |
|
||||
|
@ -84,10 +87,10 @@ jobs:
|
|||
id: ubuntu-18.04
|
||||
- ubuntu: bionic
|
||||
compiler: clang
|
||||
compiler-cxx: clang
|
||||
compiler-cxx: clang++
|
||||
compiler-version: 8
|
||||
runner: ubuntu-18.04
|
||||
packages: clang-8
|
||||
packages: clang-8 clang-format-8 clang-tidy-8
|
||||
extra_command: ""
|
||||
id: ubuntu-18.04-clang
|
||||
- ubuntu: focal
|
||||
|
@ -99,10 +102,10 @@ jobs:
|
|||
id: ubuntu-20.04
|
||||
- ubuntu: focal
|
||||
compiler: clang
|
||||
compiler-cxx: clang
|
||||
compiler-cxx: clang++
|
||||
compiler-version: 9
|
||||
runner: ubuntu-20.04
|
||||
packages: clang-9
|
||||
packages: clang-9 clang-format-9 clang-tidy-9
|
||||
extra_command: ""
|
||||
id: ubuntu-20.04-clang
|
||||
runs-on: ${{ matrix.runner }}
|
||||
|
@ -141,7 +144,11 @@ jobs:
|
|||
- name: "Configure Project"
|
||||
shell: bash
|
||||
run: |
|
||||
cmake -H. -B"build/temp" -DCMAKE_INSTALL_PREFIX="build/distrib" -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" -DOBS_DOWNLOAD=ON
|
||||
cmake -H. -B"build/temp" \
|
||||
-DCMAKE_INSTALL_PREFIX="build/distrib" \
|
||||
-DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" \
|
||||
-DCMAKE_PACKAGE_PREFIX="build/package" \
|
||||
-DENABLE_FILTER_NVIDIA_FACE_TRACKING=FALSE
|
||||
- name: "Build Project"
|
||||
shell: bash
|
||||
run: |
|
||||
|
|
7
.github/workflows/validate.yml
vendored
7
.github/workflows/validate.yml
vendored
|
@ -11,7 +11,7 @@ jobs:
|
|||
runs-on: ubuntu-20.04
|
||||
env:
|
||||
CC: clang-9
|
||||
CXX: clang-9
|
||||
CXX: clang++-9
|
||||
CMAKE_GENERATOR: "Ninja"
|
||||
steps:
|
||||
- name: "Clone Repository"
|
||||
|
@ -31,7 +31,7 @@ jobs:
|
|||
libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev \
|
||||
libcurl4-openssl-dev \
|
||||
checkinstall pkg-config \
|
||||
clang clang-format
|
||||
clang-9 clang-format-9 clang-tidy-9
|
||||
- name: "Cache: Prerequisites"
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
|
@ -44,8 +44,7 @@ jobs:
|
|||
cmake -H. -B"build/temp" \
|
||||
-DCMAKE_INSTALL_PREFIX="build/distrib" \
|
||||
-DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" \
|
||||
-DOBS_DOWNLOAD=ON \
|
||||
-DENABLE_CLANG=TRUE
|
||||
-DENABLE_CLANG=TRUE -DENABLE_FILTER_NVIDIA_FACE_TRACKING=FALSE
|
||||
cmake --build "build/temp" --config RelWithDebInfo --target StreamFX_CLANG-FORMAT
|
||||
- name: "Validate Formatting"
|
||||
shell: bash
|
||||
|
|
Loading…
Reference in a new issue