mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-11 06:15:05 +00:00
ci: Upgrade to LLVM/Clang 14.x
This commit is contained in:
parent
8241a7eb97
commit
9e6171ab06
3 changed files with 33 additions and 9 deletions
11
.github/workflows/main.yml
vendored
11
.github/workflows/main.yml
vendored
|
@ -181,9 +181,14 @@ jobs:
|
||||||
if: startsWith( matrix.runner, 'ubuntu' ) && ( matrix.generator == 'Clang' )
|
if: startsWith( matrix.runner, 'ubuntu' ) && ( matrix.generator == 'Clang' )
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 14
|
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 14 all
|
||||||
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 800
|
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-14 800
|
||||||
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 800
|
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/lld lld /usr/bin/lld-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-14 800
|
||||||
|
|
||||||
- name: 'Dependency: Packages (Linux)'
|
- name: 'Dependency: Packages (Linux)'
|
||||||
if: startsWith( matrix.runner, 'macos' )
|
if: startsWith( matrix.runner, 'macos' )
|
||||||
|
@ -229,7 +234,9 @@ jobs:
|
||||||
-DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} \
|
-DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} \
|
||||||
-DCMAKE_INSTALL_PREFIX="build/distrib" \
|
-DCMAKE_INSTALL_PREFIX="build/distrib" \
|
||||||
-DPACKAGE_NAME="streamfx-${{ matrix.PACKAGE_NAME }}" \
|
-DPACKAGE_NAME="streamfx-${{ matrix.PACKAGE_NAME }}" \
|
||||||
-DPACKAGE_PREFIX="build/package"
|
-DPACKAGE_PREFIX="build/package" \
|
||||||
|
-DENABLE_CLANG=FALSE \
|
||||||
|
-DENABLE_PROFILING=FALSE
|
||||||
|
|
||||||
- name: "Build (Windows)"
|
- name: "Build (Windows)"
|
||||||
if: startsWith( matrix.runner, 'windows' )
|
if: startsWith( matrix.runner, 'windows' )
|
||||||
|
|
25
.github/workflows/validate.yml
vendored
25
.github/workflows/validate.yml
vendored
|
@ -64,8 +64,8 @@ jobs:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: "Prerequisites: Apt-Get"
|
- name: "Dependency: Ninja, Qt, FFmpeg, CURL (Linux)"
|
||||||
if: startsWith( matrix.id, 'linux' )
|
if: startsWith( matrix.runner, 'ubuntu' )
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -qq update
|
sudo apt-get -qq update
|
||||||
|
@ -80,9 +80,25 @@ jobs:
|
||||||
qtbase5-dev qtbase5-private-dev libqt5svg5-dev \
|
qtbase5-dev qtbase5-private-dev libqt5svg5-dev \
|
||||||
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
|
||||||
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 14
|
|
||||||
|
- name: "Dependency: Clang (Windows)"
|
||||||
|
if: startsWith( matrix.runner, 'windows' )
|
||||||
|
run: |
|
||||||
|
curl "-kL" "https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/LLVM-14.0.4-win64.exe" "-f" "--retry" "5" "-o" "llvm.exe"
|
||||||
|
7z x -y -o"C:\Program Files\LLVM" llvm.exe "bin" "include" "lib" "libexec" "share" "Uninstall.exe"
|
||||||
|
|
||||||
|
- name: "Dependency: Clang (Linux)"
|
||||||
|
if: startsWith( matrix.runner, 'ubuntu' )
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 14 all
|
||||||
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 800
|
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-14 800
|
||||||
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 800
|
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/lld lld /usr/bin/lld-14 800
|
||||||
|
sudo update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-14 800
|
||||||
|
|
||||||
- name: "Dependencies: Cache"
|
- name: "Dependencies: Cache"
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
|
@ -97,7 +113,8 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
cmake -H. -B"build/temp" \
|
cmake -H. -B"build/temp" \
|
||||||
-DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} \
|
-DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} \
|
||||||
-DENABLE_CLANG=TRUE
|
-DENABLE_CLANG=TRUE \
|
||||||
|
-DENABLE_PROFILING=TRUE
|
||||||
|
|
||||||
- name: "StreamFX: clang-tidy"
|
- name: "StreamFX: clang-tidy"
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
|
|
|
@ -2213,12 +2213,12 @@ if(T_CHECK AND HAVE_CLANG)
|
||||||
)
|
)
|
||||||
clang_tidy(
|
clang_tidy(
|
||||||
TARGETS ${PROJECT_NAME}
|
TARGETS ${PROJECT_NAME}
|
||||||
VERSION 9.0.0
|
VERSION 14.0.0
|
||||||
)
|
)
|
||||||
clang_format(
|
clang_format(
|
||||||
TARGETS ${PROJECT_NAME}
|
TARGETS ${PROJECT_NAME}
|
||||||
DEPENDENCY
|
DEPENDENCY
|
||||||
VERSION 9.0.0
|
VERSION 14.0.0
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue