etc
/
obs-StreamFX
mirror of https://github.com/Xaymar/obs-StreamFX
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Fix support for new CMake script

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-09-28 21:28:21 +02:00
parent 3097a4f552
commit e8d5edc9eb
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,10 @@ jobs:
- name: "Configure Project" - name: "Configure Project"
shell: bash shell: bash
run: | 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" - name: "Build Project"
shell: bash shell: bash
run: | run: |
@ -84,10 +87,10 @@ jobs:
id: ubuntu-18.04 id: ubuntu-18.04
- ubuntu: bionic - ubuntu: bionic
compiler: clang compiler: clang
compiler-cxx: clang compiler-cxx: clang++
compiler-version: 8 compiler-version: 8
runner: ubuntu-18.04 runner: ubuntu-18.04
packages: clang-8 packages: clang-8 clang-format-8 clang-tidy-8
extra_command: "" extra_command: ""
id: ubuntu-18.04-clang id: ubuntu-18.04-clang
- ubuntu: focal - ubuntu: focal
@ -99,10 +102,10 @@ jobs:
id: ubuntu-20.04 id: ubuntu-20.04
- ubuntu: focal - ubuntu: focal
compiler: clang compiler: clang
compiler-cxx: clang compiler-cxx: clang++
compiler-version: 9 compiler-version: 9
runner: ubuntu-20.04 runner: ubuntu-20.04
packages: clang-9 packages: clang-9 clang-format-9 clang-tidy-9
extra_command: "" extra_command: ""
id: ubuntu-20.04-clang id: ubuntu-20.04-clang
runs-on: ${{ matrix.runner }} runs-on: ${{ matrix.runner }}
@ -141,7 +144,11 @@ jobs:
- name: "Configure Project" - name: "Configure Project"
shell: bash shell: bash
run: | 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" - name: "Build Project"
shell: bash shell: bash
run: | run: |

7
.github/workflows/validate.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
CC: clang-9 CC: clang-9
CXX: clang-9 CXX: clang++-9
CMAKE_GENERATOR: "Ninja" CMAKE_GENERATOR: "Ninja"
steps: steps:
- name: "Clone Repository" - name: "Clone Repository"
@ -31,7 +31,7 @@ jobs:
libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev \ libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
checkinstall pkg-config \ checkinstall pkg-config \
clang clang-format clang-9 clang-format-9 clang-tidy-9
- name: "Cache: Prerequisites" - name: "Cache: Prerequisites"
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
@ -44,8 +44,7 @@ jobs:
cmake -H. -B"build/temp" \ cmake -H. -B"build/temp" \
-DCMAKE_INSTALL_PREFIX="build/distrib" \ -DCMAKE_INSTALL_PREFIX="build/distrib" \
-DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" \ -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" \
-DOBS_DOWNLOAD=ON \ -DENABLE_CLANG=TRUE -DENABLE_FILTER_NVIDIA_FACE_TRACKING=FALSE
-DENABLE_CLANG=TRUE
cmake --build "build/temp" --config RelWithDebInfo --target StreamFX_CLANG-FORMAT cmake --build "build/temp" --config RelWithDebInfo --target StreamFX_CLANG-FORMAT
- name: "Validate Formatting" - name: "Validate Formatting"
shell: bash shell: bash