Skip to content

Commit 5b0c091

Browse files
author
Jan VL
committed
fix(fmt): use clang-format-18 to match CI expectations
1 parent 8b7c82b commit 5b0c091

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

examples/tck_host_application.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ class TCKHostApplication {
6868
void run_multiple_broker_test(const std::vector<std::string>& params);
6969

7070
// Helper to establish session without publishing test results
71-
[[nodiscard]] auto establish_session(const std::string& host_id)
72-
-> stdx::expected<void, std::string>;
71+
[[nodiscard]] auto
72+
establish_session(const std::string& host_id) -> stdx::expected<void, std::string>;
7373

7474
// Utility functions for TCK communication
7575
void log(const std::string& level, const std::string& message);

scripts/format.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@
33

44
set -e
55

6-
# Detect clang-format binary
7-
if command -v /opt/homebrew/bin/clang-format &> /dev/null; then
8-
CLANG_FORMAT=/opt/homebrew/bin/clang-format
6+
# Detect clang-format binary (prefer clang-format-18 to match CI)
7+
if [ -n "$CLANG_FORMAT" ]; then
8+
# Use environment variable if set
9+
:
910
elif command -v clang-format-18 &> /dev/null; then
1011
CLANG_FORMAT=clang-format-18
12+
elif [ -f /opt/homebrew/opt/llvm@18/bin/clang-format ]; then
13+
CLANG_FORMAT=/opt/homebrew/opt/llvm@18/bin/clang-format
14+
elif command -v /opt/homebrew/bin/clang-format &> /dev/null; then
15+
CLANG_FORMAT=/opt/homebrew/bin/clang-format
1116
elif command -v clang-format &> /dev/null; then
1217
CLANG_FORMAT=clang-format
1318
else

0 commit comments

Comments
 (0)