Only clang-format-20 on ubuntu 24

Author: cacharle

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
             libzmq: "4.3.5"
             libzmqbuild: "cmake"
             coverage: "-DCOVERAGE=ON"
-            aptinstall: "lcov clang-format"
+            aptinstall: "lcov"
           # clang
           - os: "ubuntu-22.04"
             cppstd: "17"
@@ -61,7 +61,7 @@ jobs:
             drafts: "OFF"
             libzmq: "4.3.5"
             libzmqbuild: false
-            brewinstall: "zeromq clang-format"
+            brewinstall: "zeromq"
           # windows
           #- os: "windows-2019"
           #  cppstd: "14"
@@ -133,10 +133,11 @@ jobs:
         echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
 
     - name: format
-      if: ${{ startsWith(matrix.os, 'ubuntu') }}
+      if: ${{ startsWith(matrix.os, 'ubuntu-24') }}
       run: |
-        clang-format --version
-        git ls-files | grep -E '\.(cpp|hpp)' | xargs clang-format --dry-run --Werror
+        sudo apt install -y clang-format-20
+        clang-format-20 --version
+        git ls-files | grep -E '\.(cpp|hpp)' | xargs clang-format-20 --dry-run --Werror
 
     - name: build
       env:

tests/timers.cpp

@@ -22,8 +22,7 @@ TEST_CASE("timers add/execute", "[timers]")
     using namespace std::chrono_literals;
     zmq::timers timers;
     bool handler_ran = false;
-    timers.add(
-      4ms, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
+    timers.add(4ms, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
     CHECK(timers.timeout().has_value());
     CHECK(!handler_ran);
     std::this_thread::sleep_for(10ms);
@@ -36,8 +35,8 @@ TEST_CASE("timers add/cancel", "[timers]")
     using namespace std::chrono_literals;
     zmq::timers timers;
     bool handler_ran = false;
-    auto id = timers.add(
-      4ms, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
+    auto id =
+      timers.add(4ms, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
     CHECK(timers.timeout().has_value());
     CHECK(!handler_ran);
     timers.cancel(id);
@@ -51,8 +50,8 @@ TEST_CASE("timers set_interval", "[timers]")
     zmq::timers timers;
     bool handler_ran = false;
     // Interval of 4 hours should never run like this
-    auto id = timers.add(
-      4h, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
+    auto id =
+      timers.add(4h, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
     CHECK(timers.timeout().has_value());
     CHECK(!handler_ran);
     // Change the interval to 4ms and wait for it to timeout
@@ -67,8 +66,8 @@ TEST_CASE("timers reset", "[timers]")
     using namespace std::chrono_literals;
     zmq::timers timers;
     bool handler_ran = false;
-    auto id = timers.add(
-      4ms, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
+    auto id =
+      timers.add(4ms, [](auto, void *arg) { *(bool *) arg = true; }, &handler_ran);
     CHECK(timers.timeout().has_value());
     std::this_thread::sleep_for(10ms);
     // Available to be executed but we reset it