From 094c433e587946ae0c3943bc6481876ea783842d Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sat, 23 Dec 2023 14:20:24 +0100 Subject: [PATCH] Update clang-tidy workflow --- .github/workflows/cpp_lint.yml | 7 +++++-- util/ci/clang-tidy.sh | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cpp_lint.yml b/.github/workflows/cpp_lint.yml index a5e49277b..f15ba705f 100644 --- a/.github/workflows/cpp_lint.yml +++ b/.github/workflows/cpp_lint.yml @@ -23,15 +23,18 @@ on: - 'util/ci/**' - '.github/workflows/**.yml' +env: + CLANG_TIDY: clang-tidy-15 + jobs: clang_tidy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Install deps run: | source ./util/ci/common.sh - install_linux_deps clang-tidy-9 + install_linux_deps $CLANG_TIDY - name: Run clang-tidy run: | diff --git a/util/ci/clang-tidy.sh b/util/ci/clang-tidy.sh index e678cf3b9..99f419395 100755 --- a/util/ci/clang-tidy.sh +++ b/util/ci/clang-tidy.sh @@ -3,11 +3,11 @@ cmake -B build -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DRUN_IN_PLACE=TRUE \ - -DENABLE_{GETTEXT,SOUND}=FALSE \ + -DENABLE_GETTEXT=FALSE \ -DBUILD_SERVER=TRUE cmake --build build --target GenerateVersion ./util/ci/run-clang-tidy.py \ - -clang-tidy-binary=clang-tidy-9 -p build \ + -clang-tidy-binary=$CLANG_TIDY -p build \ -quiet -config="$(cat .clang-tidy)" \ 'src/.*'