summaryrefslogtreecommitdiff
path: root/libcxx/utils
diff options
context:
space:
mode:
authorMark de Wever <koraq@xs4all.nl>2023-04-20 21:03:39 +0200
committerMark de Wever <koraq@xs4all.nl>2023-04-27 17:24:17 +0200
commit019e784bb19b4f4a8e4d4d9a3a604fba2d22ddf0 (patch)
treed45a4864f24ffdd48a7b4783dda391a4d255a187 /libcxx/utils
parentab85aec1affc92647c195f736d1bac69976baeb8 (diff)
downloadllvm-019e784bb19b4f4a8e4d4d9a3a604fba2d22ddf0.tar.gz
[libc++] Adds newer clang-tidy in the CI.
In order to use clang-tidy for modules version 17 is required. Some of the development fixes haven't been backported. This adds the new version to the CI so it can be used in a follow-up patch. Reviewed By: #libc, ldionne Differential Revision: https://reviews.llvm.org/D148831
Diffstat (limited to 'libcxx/utils')
-rw-r--r--libcxx/utils/ci/Dockerfile10
1 files changed, 7 insertions, 3 deletions
diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 85d0ff17b2a8..e8c5d5dad331 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -84,11 +84,15 @@ RUN apt-get update && apt-get install -y clang-tools-$(($LLVM_HEAD_VERSION - 3))
RUN apt-get update && apt-get install -y clang-format-$(($LLVM_HEAD_VERSION - 2)) clang-format-$(($LLVM_HEAD_VERSION - 1))
# Install clang-tidy
-RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 2)) clang-tidy-$((LLVM_HEAD_VERSION - 1))
+# TODO LLVM 17 revert D148831 to only install $(($LLVM_HEAD_VERSION - 1)) and $LLVM_HEAD_VERSION
+# The usage of the ToT version is needed due to module issues with Clang 16
+RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 2)) clang-tidy-$(($LLVM_HEAD_VERSION - 1)) clang-tidy-$LLVM_HEAD_VERSION
# Install llvm-dev and libclang-dev to compile custom clang-tidy checks
-RUN apt-get update && apt-get install -y llvm-$(($LLVM_HEAD_VERSION - 1))-dev llvm-$(($LLVM_HEAD_VERSION - 2))-dev \
- libclang-$(($LLVM_HEAD_VERSION - 1))-dev libclang-$(($LLVM_HEAD_VERSION - 2))-dev
+# TODO LLVM 17 revert D148831 to only install $(($LLVM_HEAD_VERSION - 1)) and $LLVM_HEAD_VERSION
+# The usage of the ToT version is needed due to module issues with Clang 16
+RUN apt-get update && apt-get install -y llvm-$(($LLVM_HEAD_VERSION - 2))-dev llvm-$(($LLVM_HEAD_VERSION - 1))-dev llvm-$LLVM_HEAD_VERSION-dev \
+ libclang-$(($LLVM_HEAD_VERSION - 2))-dev libclang-$(($LLVM_HEAD_VERSION - 1))-dev libclang-$LLVM_HEAD_VERSION-dev
# Install the most recent GCC, like clang install the previous version as a transition.
ENV GCC_LATEST_VERSION=12