Introduce matrix stategy to CI

Author: gen740

.clang-tidy

@@ -21,6 +21,7 @@ Checks: >-
   -misc-non-private-member-variables-in-classes,
   -readability-function-cognitive-complexity,
   -readability-magic-numbers,
+  -readability-redundant-declaration,
   -misc-include-cleaner,
 WarningsAsErrors: ''
 HeaderFileExtensions:

.github/workflows/test-mac.yml

@@ -13,9 +13,9 @@ jobs:
   tests:
     runs-on: macos-latest
 
-    # strategy:
-    #   matrix:
-    #     build_type: [Release, Debug]
+    strategy:
+      matrix:
+        build_type: [Release, Debug]
 
     steps:
       - name: Checkout
@@ -40,39 +40,32 @@ jobs:
       - name: Add LLVM Path
         run: echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
 
-      - name: Build Debug
+      - name: Build ${{ matrix.build_type }}
         run: |
-          cmake -B build_debug -S . -DARGO_TESTS_ENABLE=true -GNinja -DCMAKE_BUILD_TYPE=Debug -DARGO_CLANG_TIDY_ENABLE=ON
-          cmake --build build_debug
+          cmake -B build -S . -DARGO_TESTS_ENABLE=true -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          cmake --build build
         env:
           CC: /usr/local/opt/llvm/bin/clang
           CXX: /usr/local/opt/llvm/bin/clang++
           LDFLAGS: -L/usr/local/opt/llvm/lib -L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++
           CPPFLAGS: -I/usr/local/opt/llvm/include
 
-      - name: Build Release
+      - name: Test ${{ matrix.build_type }}
+        if: matrix.build_type == 'Release'
         run: |
-          cmake -B build_release -S . -DARGO_TESTS_ENABLE=true -GNinja -DCMAKE_BUILD_TYPE=Release
-          cmake --build build_release
-        env:
-          CC: /usr/local/opt/llvm/bin/clang
-          CXX: /usr/local/opt/llvm/bin/clang++
-          LDFLAGS: -L/usr/local/opt/llvm/lib -L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++
-          CPPFLAGS: -I/usr/local/opt/llvm/include
-
-      - name: Test Release
-        run: |
-          cmake --build build_release --target test
+          cmake --build build --target test
 
       - name: Test Debug with codecov
+        if: matrix.build_type == 'Debug'
         run: |
-          LLVM_PROFILE_FILE=./build_debug/test-argo.profraw ./build_debug/test-argo
-          /usr/local/opt/llvm/bin/llvm-profdata merge -sparse ./build_debug/test-argo.profraw -o ./build_debug/coverage.profdata
-          /usr/local/opt/llvm/bin/llvm-cov show ./build_debug/test-argo -instr-profile=./build_debug/coverage.profdata -ignore-filename-regex="tests*" -ignore-filename-regex="Argo/ArgoExceptions.cc" > ./build_debug/coverage.txt
+          LLVM_PROFILE_FILE=./build/test-argo.profraw ./build/test-argo
+          /usr/local/opt/llvm/bin/llvm-profdata merge -sparse ./build/test-argo.profraw -o ./build/coverage.profdata
+          /usr/local/opt/llvm/bin/llvm-cov show ./build/test-argo -instr-profile=./build/coverage.profdata -ignore-filename-regex="tests*" -ignore-filename-regex="Argo/ArgoExceptions.cc" > ./build/coverage.txt
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
+        if: matrix.build_type == 'Debug'
         with:
-          files: ./build_debug/coverage.txt
+          files: ./build/coverage.txt
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Argo/ArgoMetaAssigner.cc

@@ -259,7 +259,6 @@ ARGO_ALWAYS_INLINE constexpr auto Assigner(
 template <class Arguments, class PArgs, class HArg>
 ARGO_ALWAYS_INLINE constexpr auto ShortArgAssigner(
     std::string_view key, const std::span<std::string_view>& values) {
-  bool has_help = false;
   for (size_t i = 0; i < key.size(); i++) {
     auto [found_key, is_flag] = GetkeyFromShortKey<     //
         std::conditional_t<std::is_same_v<HArg, void>,  //
@@ -276,17 +275,17 @@ ARGO_ALWAYS_INLINE constexpr auto ShortArgAssigner(
       assignArg<Arguments, PArgs>(found_key, {});
     } else if ((key.size() - 1 == i) and !values.empty()) {
       assignArg<Arguments, PArgs>(found_key, values);
-      return has_help;
+      return false;
     } else if ((key.size() - 1 == i) and values.empty()) {
       auto value = std::vector<std::string_view>{key.substr(i + 1)};
       assignArg<Arguments, PArgs>(found_key, value);
-      return has_help;
+      return false;
     } else [[unlikely]] {
       throw Argo::InvalidArgument(
           format("Invalid Flag argument {} {}", key[i], key.substr(i + 1)));
     }
   }
-  return has_help;
+  return false;
 }
 
 template <class Args>

Argo/ArgoParser.cc

@@ -277,7 +277,7 @@ class Parser {
   }
 
   template <ArgName Name>
-  constexpr auto& getParser() {
+  constexpr auto getParser() -> auto& {
     if constexpr (std::is_same_v<SubParsers, std::tuple<>>) {
       static_assert(false, "Parser has no sub parser");
     }
@@ -345,7 +345,8 @@ class Parser {
 
  public:
   ARGO_ALWAYS_INLINE constexpr auto parse(int argc, char* argv[]) -> void;
-  [[nodiscard]] constexpr std::string formatHelp(bool no_color = false) const;
+  [[nodiscard]] constexpr auto formatHelp(bool no_color = false) const
+      -> std::string;
 
   explicit constexpr operator bool() const {
     return this->parsed_;

Argo/ArgoParserImpl.cc

@@ -1,7 +1,6 @@
 module;
 
 #include <cassert>
-#include <print>
 
 #include "Argo/ArgoMacros.hh"
 

CMakeLists.txt

@@ -76,7 +76,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR})
                              "${CLANG_TIDY_EXE};-p;${CMAKE_BINARY_DIR}")
     endif()
     if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-      message("Debug build")
       target_compile_options(test-argo PRIVATE -fprofile-instr-generate
                                                -fcoverage-mapping)
       target_link_options(test-argo PRIVATE -fprofile-instr-generate