Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Linter revert version to clang-15 #630

Merged
merged 1 commit into from
Nov 4, 2024
+2 −2
Merged

Linter revert version to clang-15 #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ list(REMOVE_ITEM SRC_SILO_WITHOUT_MAIN "${CMAKE_SOURCE_DIR}/src/silo_api/api.cpp

option(BUILD_WITH_CLANG_TIDY "Build process clang-tidy")
if (NOT CMAKE_BUILD_TYPE STREQUAL Release AND BUILD_WITH_CLANG_TIDY)
find_program(CLANG_TIDY_EXE NAMES clang-tidy-20)
find_program(CLANG_TIDY_EXE NAMES clang-tidy-15) # TODO(#632) revert to clang-tidy-20
if (NOT CLANG_TIDY_EXE)
message(SEND_ERROR "clang-tidy not found, aborting. You can run the build with '-D BUILD_WITH_CLANG_TIDY=OFF' to disable clang-tidy.")
else ()
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_linter_dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt update \
cmake python3-pip software-properties-common wget gnupg lsb-release \
&& wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
&& add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main' \
&& apt install -y clang-tidy-20 \
&& apt install -y clang-tidy-15 \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is clang tidy 15 the only version that works right now? I think I remember that we had 17 for a while, and before we upgraded to 20, we had 19.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

15 is the most recent non-current version that is installable from that external package source. We can could also change the source to another?

Copy link
Contributor

@fengelniederhammer fengelniederhammer Nov 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, did that change? Maybe they removed the clang-19 package? Or why was it installable before?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, not all versions will be maintained. See current installation attempts:

root@063f836181fc:/# apt install clang-tidy-19
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
E: Unable to locate package clang-tidy-19
root@063f836181fc:/# apt install clang-tidy-18
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
E: Unable to locate package clang-tidy-18
root@063f836181fc:/# apt install clang-tidy-17
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
E: Unable to locate package clang-tidy-17
root@063f836181fc:/# apt install clang-tidy-16
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
E: Unable to locate package clang-tidy-16
root@063f836181fc:/# apt install clang-tidy-15
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following additional packages will be installed:
  clang-15 clang-tools-15 icu-devtools lib32gcc-s1 lib32stdc++6 libc6-i386 libclang-common-15-dev libclang-cpp15 libclang1-15 libedit2
  libffi-dev libgc1 libicu-dev libllvm15 libncurses-dev libobjc-11-dev libobjc4 libpfm4 libtinfo-dev libxml2-dev libz3-4 libz3-dev llvm-15
  llvm-15-dev llvm-15-linker-tools llvm-15-runtime llvm-15-tools python3-pygments python3-yaml
Suggested packages:
  clang-15-doc wasi-libc icu-doc ncurses-doc pkg-config llvm-15-doc python-pygments-doc ttf-bitstream-vera
The following NEW packages will be installed:
  clang-15 clang-tidy-15 clang-tools-15 icu-devtools lib32gcc-s1 lib32stdc++6 libc6-i386 libclang-common-15-dev libclang-cpp15 libclang1-15
  libedit2 libffi-dev libgc1 libicu-dev libllvm15 libncurses-dev libobjc-11-dev libobjc4 libpfm4 libtinfo-dev libxml2-dev libz3-4 libz3-dev
  llvm-15 llvm-15-dev llvm-15-linker-tools llvm-15-runtime llvm-15-tools python3-pygments python3-yaml

&& apt install -y jq \
&& apt install -y curl

Expand Down