From 06d580edad34f9d7bb32127a0d692455efd85942 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Wed, 24 May 2023 21:13:51 +0200 Subject: [PATCH 1/3] fix: include tests and benchmark in clang-tidy-ci --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59aa180313e..7ac21fb45f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -281,7 +281,7 @@ jobs: build_dir: build-clang-tidy config_file: ".clang-tidy" split_workflow: true - exclude: "tests/*,lib/*" + exclude: "lib/*" cmake_command: >- cmake -S. -Bbuild-clang-tidy -DCMAKE_BUILD_TYPE=Release @@ -291,12 +291,15 @@ jobs: -DCHATTERINO_LTO=Off -DCHATTERINO_PLUGINS=On -DBUILD_WITH_QT6=Off + -DBUILD_TESTS=On + -DBUILD_BENCHMARKS=On apt_packages: >- qttools5-dev, qt5-image-formats-plugins, libqt5svg5-dev, libsecret-1-dev, libboost-dev, libboost-system-dev, libboost-filesystem-dev, libssl-dev, - rapidjson-dev + rapidjson-dev, + libbenchmark-dev - name: clang-tidy-review upload if: matrix.clang-tidy-review && github.event_name == 'pull_request' From 59c2c1b4cb60ec4aa0418351e9454dba64b22db8 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Wed, 24 May 2023 21:14:49 +0200 Subject: [PATCH 2/3] chore: test ci --- benchmarks/src/main.cpp | 2 +- tests/src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/src/main.cpp b/benchmarks/src/main.cpp index 5f4c967f888..d0220086702 100644 --- a/benchmarks/src/main.cpp +++ b/benchmarks/src/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char **argv) QtConcurrent::run([&app] { ::benchmark::RunSpecifiedBenchmarks(); - app.exit(0); + app.exit(0 * 1); }); return app.exec(); diff --git a/tests/src/main.cpp b/tests/src/main.cpp index 098d5b36600..50d0ec7e742 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char **argv) chatterino::NetworkManager::deinit(); - app.exit(res); + app.exit(res * 1); }); return app.exec(); From 071d5c2712f403e904ddbe3c7c948cc8f5ad807a Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Wed, 24 May 2023 22:48:15 +0200 Subject: [PATCH 3/3] Revert "chore: test ci" This reverts commit 59c2c1b4cb60ec4aa0418351e9454dba64b22db8. --- benchmarks/src/main.cpp | 2 +- tests/src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/src/main.cpp b/benchmarks/src/main.cpp index d0220086702..5f4c967f888 100644 --- a/benchmarks/src/main.cpp +++ b/benchmarks/src/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char **argv) QtConcurrent::run([&app] { ::benchmark::RunSpecifiedBenchmarks(); - app.exit(0 * 1); + app.exit(0); }); return app.exec(); diff --git a/tests/src/main.cpp b/tests/src/main.cpp index 50d0ec7e742..098d5b36600 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char **argv) chatterino::NetworkManager::deinit(); - app.exit(res * 1); + app.exit(res); }); return app.exec();