Skip to content

Commit

Permalink
Turns out it is 19 but I'm doing it wrong?
Browse files Browse the repository at this point in the history
  • Loading branch information
TrentHouliston committed Dec 25, 2024
1 parent 915a4d4 commit 9d2fa74
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/linting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
- name: Install clang-tidy
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main" | sudo tee /etc/apt/sources.list.d/llvm-19
echo "deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main" | sudo tee -a /etc/apt/sources.list.d/llvm-19
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main" | sudo tee /etc/apt/sources.list.d/llvm-19.list
echo "deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main" | sudo tee -a /etc/apt/sources.list.d/llvm-19.list
sudo apt-get update
sudo apt-get install -y clang-tidy-20
sudo apt-get install -y clang-tidy-19
# Download and install cmake
- name: Install CMake
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
mkdir -p ${{ github.workspace }}/.ctcache
echo CTCACHE_CLANG_TIDY='/usr/bin/clang-tidy-20' >> "$GITHUB_ENV"
echo CTCACHE_CLANG_TIDY='/usr/bin/clang-tidy-19' >> "$GITHUB_ENV"
echo CTCACHE_LOCAL=1 >> "$GITHUB_ENV"
echo CTCACHE_SAVE_OUTPUT=1 >> "$GITHUB_ENV"
echo CTCACHE_DIR='${{github.workspace}}/.ctcache' >> "$GITHUB_ENV"
Expand Down
6 changes: 3 additions & 3 deletions cmake/ClangTidy.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Default not to run the clang-tidy checks, default to whatever our CI_BUILD is
option(ENABLE_CLANG_TIDY "Enable building with clang-tidy checks.")
if(ENABLE_CLANG_TIDY)
# Search for clang-tidy-15 first as this is the version installed in CI
find_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy-15 clang-tidy)
# Search for the same version of clang-tidy as is used in CI first
find_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy-19 clang-tidy)
if(NOT CLANG_TIDY_EXECUTABLE)
message(FATAL_ERROR "clang-tidy-15 not found.")
message(FATAL_ERROR "clang-tidy not found.")
endif()

# Report clang-tidy executable details
Expand Down

0 comments on commit 9d2fa74

Please sign in to comment.