mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-14 07:45:06 +00:00
ci: Always set up path for clang binaries
This commit is contained in:
parent
008a3f2a31
commit
19de4c5334
1 changed files with 7 additions and 5 deletions
12
.github/workflows/main.yml
vendored
12
.github/workflows/main.yml
vendored
|
@ -86,6 +86,7 @@ jobs:
|
||||||
run: |
|
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"
|
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"
|
7z x -y -o"C:\Program Files\LLVM" llvm.exe "bin" "include" "lib" "libexec" "share" "Uninstall.exe"
|
||||||
|
echo "CLANG_PATH=\"C:\\Program Files\\LLVM\\bin\"" >> "${GITHUB_ENV}"
|
||||||
curl "-kL" "https://cdn.xaymar.com/ci/innosetup-6.2.1.exe" "-f" "--retry" "5" "-o" "inno.exe"
|
curl "-kL" "https://cdn.xaymar.com/ci/innosetup-6.2.1.exe" "-f" "--retry" "5" "-o" "inno.exe"
|
||||||
.\inno.exe /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
|
.\inno.exe /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
|
||||||
|
|
||||||
|
@ -112,6 +113,7 @@ jobs:
|
||||||
sudo /tmp/llvm.sh 14 all
|
sudo /tmp/llvm.sh 14 all
|
||||||
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-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/clang-tidy clang-tidy /usr/bin/clang-tidy-14 800
|
||||||
|
echo "CLANG_PATH=/usr/bin" >> "${GITHUB_ENV}"
|
||||||
|
|
||||||
# Compiler
|
# Compiler
|
||||||
if [[ "${{ matrix.generator }}" = "GCC" ]]; then
|
if [[ "${{ matrix.generator }}" = "GCC" ]]; then
|
||||||
|
@ -139,6 +141,7 @@ jobs:
|
||||||
sudo hdiutil attach ./Packages.dmg
|
sudo hdiutil attach ./Packages.dmg
|
||||||
pushd /Volumes/Packages*
|
pushd /Volumes/Packages*
|
||||||
sudo installer -pkg ./Install\ Packages.pkg -target /
|
sudo installer -pkg ./Install\ Packages.pkg -target /
|
||||||
|
echo "CLANG_PATH=$(brew --prefix llvm@14)/bin/" >> "${GITHUB_ENV}"
|
||||||
|
|
||||||
- name: "Auto-Dependency Cache"
|
- name: "Auto-Dependency Cache"
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
|
@ -158,7 +161,7 @@ jobs:
|
||||||
-DCMAKE_INSTALL_PREFIX="build/debug/install" \
|
-DCMAKE_INSTALL_PREFIX="build/debug/install" \
|
||||||
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}-debug" \
|
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}-debug" \
|
||||||
-DPACKAGE_PREFIX="build/package" \
|
-DPACKAGE_PREFIX="build/package" \
|
||||||
-DENABLE_CLANG=TRUE \
|
-DENABLE_CLANG=TRUE -DCLANG_PATH="${{ env.CLANG_PATH }}" \
|
||||||
-DENABLE_PROFILING=ON
|
-DENABLE_PROFILING=ON
|
||||||
if [[ "${{ matrix.runner }}" = windows* ]]; then
|
if [[ "${{ matrix.runner }}" = windows* ]]; then
|
||||||
cmake --build "build/debug" --config Debug --target INSTALL
|
cmake --build "build/debug" --config Debug --target INSTALL
|
||||||
|
@ -167,7 +170,6 @@ jobs:
|
||||||
elif [[ "${{ matrix.runner }}" = macos* ]]; then
|
elif [[ "${{ matrix.runner }}" = macos* ]]; then
|
||||||
cmake --build "build/debug" --config Debug --target install
|
cmake --build "build/debug" --config Debug --target install
|
||||||
fi
|
fi
|
||||||
cmake --build "build/debug" --config Debug --target StreamFX_clang-format
|
|
||||||
|
|
||||||
- name: "Configure & Build (Release)"
|
- name: "Configure & Build (Release)"
|
||||||
shell: bash
|
shell: bash
|
||||||
|
@ -177,7 +179,7 @@ jobs:
|
||||||
-DCMAKE_INSTALL_PREFIX="build/release/install" \
|
-DCMAKE_INSTALL_PREFIX="build/release/install" \
|
||||||
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
|
-DPACKAGE_NAME="streamfx-${{ matrix.package_name }}" \
|
||||||
-DPACKAGE_PREFIX="build/package" \
|
-DPACKAGE_PREFIX="build/package" \
|
||||||
-DENABLE_CLANG=TRUE \
|
-DENABLE_CLANG=TRUE -DCLANG_PATH="${{ env.CLANG_PATH }}" \
|
||||||
-DENABLE_PROFILING=OFF
|
-DENABLE_PROFILING=OFF
|
||||||
if [[ "${{ matrix.runner }}" = windows* ]]; then
|
if [[ "${{ matrix.runner }}" = windows* ]]; then
|
||||||
cmake --build "build/release" --config RelWithDebInfo --target INSTALL
|
cmake --build "build/release" --config RelWithDebInfo --target INSTALL
|
||||||
|
@ -186,12 +188,12 @@ jobs:
|
||||||
elif [[ "${{ matrix.runner }}" = macos* ]]; then
|
elif [[ "${{ matrix.runner }}" = macos* ]]; then
|
||||||
cmake --build "build/release" --config RelWithDebInfo --target install
|
cmake --build "build/release" --config RelWithDebInfo --target install
|
||||||
fi
|
fi
|
||||||
cmake --build "build/release" --config RelWithDebInfo --target StreamFX_clang-format
|
|
||||||
|
|
||||||
- name: "Validate Formatting"
|
- name: "Validate Formatting"
|
||||||
continue-on-error: false
|
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
cmake --build "build/debug" --config Debug --target StreamFX_clang-format
|
||||||
|
cmake --build "build/release" --config RelWithDebInfo --target StreamFX_clang-format
|
||||||
git --no-pager diff --patch --minimal HEAD --
|
git --no-pager diff --patch --minimal HEAD --
|
||||||
git update-index --refresh
|
git update-index --refresh
|
||||||
git diff-index --quiet HEAD --
|
git diff-index --quiet HEAD --
|
||||||
|
|
Loading…
Reference in a new issue