Skip to content

Commit 6e17749

Browse files
Update to clang-format 17. (#4675)
[SC-39200](https://app.shortcut.com/tiledb-inc/story/39200/make-sure-that-clang-format-is-the-same-across-os-jobs) There are no formatting changes. --- TYPE: NO_HISTORY
1 parent ee6c1bc commit 6e17749

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

cmake/Modules/FindClangTools.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ endif()
5252

5353
find_program(CLANG_FORMAT_BIN
5454
NAMES
55-
clang-format-16
55+
clang-format-17
5656
clang-format
5757
PATHS ${ClangTools_PATH} $ENV{CLANG_TOOLS_PATH} /usr/local/bin /usr/bin
5858
NO_DEFAULT_PATH

cmake/Modules/Format.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
3232

3333
find_package(ClangTools)
3434
if (NOT ${CLANG_FORMAT_FOUND})
35-
find_program(CLANG_FORMAT_BIN NAMES clang-format-16)
35+
find_program(CLANG_FORMAT_BIN NAMES clang-format-17)
3636
if(CLANG_FORMAT_BIN)
3737
set(CLANG_FORMAT_FOUND TRUE)
3838
endif()

scripts/ci/check_formatting_linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ sudo ./scripts/install-clangformat.sh
3535
src=$GITHUB_WORKSPACE
3636
cd $src
3737

38-
$src/scripts/run-clang-format.sh $src clang-format-16 0
38+
$src/scripts/run-clang-format.sh $src clang-format-17 0

scripts/install-clangformat.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ die() {
2929
}
3030

3131
install_apt_pkg() {
32-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
33-
add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' &&
34-
apt-get update -qq && apt-get install -qq -y clang-format-16
32+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key > /etc/apt/trusted.gpg.d/apt.llvm.org.asc
33+
add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main' &&
34+
apt-get update -qq && apt-get install -qq -y clang-format-17
3535
}
3636

3737
install_brew_pkg() {

0 commit comments

Comments
 (0)