From 7a80082471e5983857c92900dc4858427994e236 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 28 Feb 2026 23:53:08 +0100 Subject: [PATCH] GHA/windows: bump clang-tidy job to clang v20 (from v18) Adds 50 seconds to the 5m long build step. Also more prerequisites to install, with no apparent effect on step time. Follow-up to 9b52d516bb8990107f20c9786e09dbb6961c30b2 #20732 Closes #20775 --- .github/workflows/windows.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f34f1f45b2..cc95548cad 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -677,10 +677,12 @@ jobs: include: - { build: 'autotools', compiler: 'gcc' } - { build: 'cmake' , compiler: 'gcc' } - - { build: 'cmake' , compiler: 'clang-tidy' } + - { build: 'cmake' , compiler: 'clang-tidy', install_packages: 'clang-20 clang-tidy-20' } steps: - name: 'install packages' - run: sudo apt-get -o Dpkg::Use-Pty=0 install gcc-mingw-w64-x86-64-win32 + env: + MATRIX_INSTALL_PACKAGES: '${{ matrix.install_packages }}' + run: sudo apt-get -o Dpkg::Use-Pty=0 install gcc-mingw-w64-x86-64-win32 ${MATRIX_INSTALL_PACKAGES} - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: @@ -694,10 +696,10 @@ jobs: run: | if [ "${MATRIX_BUILD}" = 'cmake' ]; then if [ "${MATRIX_COMPILER}" = 'clang-tidy' ]; then - options+=' -DCURL_CLANG_TIDY=ON' + options+=' -DCURL_CLANG_TIDY=ON -DCLANG_TIDY=/usr/bin/clang-tidy-20' options+=' -DENABLE_UNICODE=ON -DUSE_SSLS_EXPORT=ON' - options+=' -DCMAKE_C_COMPILER=clang' - options+=" -DCMAKE_RC_COMPILER=llvm-windres-$(clang -dumpversion | cut -d '.' -f 1)" + options+=' -DCMAKE_C_COMPILER=clang-20' + options+=" -DCMAKE_RC_COMPILER=llvm-windres-$(clang-20 -dumpversion | cut -d '.' -f 1)" else options+=" -DCMAKE_C_COMPILER=${TRIPLET}-gcc" fi