Skip to content

Commit 5c57386

Browse files
committed
Add clang on the CI for windows and linux
1 parent b03686d commit 5c57386

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

.github/workflows/cpp-ci-serial-programs.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,25 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: [windows-2025, macos-13, ubuntu-24.04]
13+
compiler: ['default', 'clang']
1314
qt_version: ['6.9.0']
1415
include:
15-
- qt_version: '6.9.0'
16-
qt_version_major: '6'
17-
qt_modules: 'qtmultimedia qtserialport'
16+
- qt_version: '6.9.0'
17+
qt_version_major: '6'
18+
qt_modules: 'qtmultimedia qtserialport'
19+
20+
- os: 'windows-2025'
21+
compiler: 'clang'
22+
cmake_additional_param: '-T ClangCL'
23+
24+
- os: 'ubuntu-24.04'
25+
compiler: 'clang'
26+
cmake_additional_param: '-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++'
27+
28+
exclude:
29+
- os: 'macos-13'
30+
compiler: 'clang'
31+
# Excluded because macos default toolset is already clang
1832

1933
steps:
2034
- uses: actions/checkout@v4
@@ -42,7 +56,7 @@ jobs:
4256
cd Arduino-Source/SerialPrograms
4357
mkdir bin
4458
cd bin
45-
cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }}
59+
cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }} ${{ matrix.cmake_additional_param }}
4660
cmake --build . --config Release --parallel 10
4761
- name: Copy resources
4862
if: startsWith(matrix.os, 'windows')

ClientSource/Connection/MessageLogger.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ void SerialLogger::log(const std::string& msg, Color color){
9696
m_logger.log(msg, color);
9797
}
9898
}
99-
void SerialLogger::log(std::string msg){
100-
if (ok_to_log()){
101-
m_logger.log(msg, COLOR_DARKGREEN);
102-
}
103-
}
10499

105100
bool SerialLogger::ok_to_log(){
106101
WallClock now = current_time();

ClientSource/Connection/MessageLogger.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ class MessageLogger : public MessageSniffer{
4040

4141

4242

43-
class SerialLogger : public Logger, public MessageLogger{
43+
class SerialLogger : public MessageLogger{
4444
public:
4545
SerialLogger(Logger& logger, bool log_everything);
4646

4747
virtual void log(const char* msg, Color color = Color()) override;
4848
virtual void log(const std::string& msg, Color color = Color()) override;
49-
virtual void log(std::string msg) override;
5049

5150
private:
5251
bool ok_to_log();

ClientSource/Connection/MessageSniffer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ namespace PokemonAutomation{
1515
struct BotBaseMessage;
1616

1717

18-
class MessageSniffer{
18+
class MessageSniffer : public Logger{
1919
public:
20-
virtual void log(std::string msg){}
2120
virtual void on_send(const BotBaseMessage& message, bool is_retransmit){}
2221
virtual void on_recv(const BotBaseMessage& message){}
2322
};

Common/Cpp/AbstractLogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace PokemonAutomation{
1616

1717
class Logger{
1818
public:
19-
virtual void log(const std::string& msg, Color color = Color()) = 0;
19+
virtual void log([[maybe_unused]] const std::string& msg, [[maybe_unused]] Color color = Color()){};
2020
virtual void log(std::string&& msg, Color color = Color()){
2121
log((const std::string&)msg, color);
2222
}

0 commit comments

Comments
 (0)