diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 524585c47..0451493a2 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -89,8 +89,8 @@ jobs: run: | set -ex wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" - sudo apt-get install -y clang-format-15 npm + sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" + sudo apt-get install -y clang-format-17 npm - name: Check for style diffs id: check-for-diffs working-directory: . diff --git a/code_style.sh b/code_style.sh index 7bb9e887c..8159ae236 100755 --- a/code_style.sh +++ b/code_style.sh @@ -40,10 +40,10 @@ find_cfiles() { ! \( $(get_find_path_args $(trim_comments .clang-format-ignore)) \) "$@" } -# We're targeting clang-format version 15 and other versions give slightly -# different results, so prefer `clang-format-15` if it's installed. +# We're targeting clang-format version 17 and other versions give slightly +# different results, so prefer `clang-format-17` if it's installed. clang_format_exe_names=( - 'clang-format-15' + 'clang-format-17' 'clang-format' ) for name in ${clang_format_exe_names[@]}; do