Merge pull request #36 from sir-gon/develop

Develop

Author: sir-gon

.github/workflows/clang-format.yml

@@ -26,8 +26,13 @@ jobs:
           sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
           sudo apt-get -y update
           sudo apt-get -y install --no-install-recommends --no-install-suggests clang-format
+          # yamllint enable rule:line-length
+
+      - name: Check Tools
+        run: |
+          make --version
+          cmake --version
           clang-format --version
-        # yamllint enable rule:line-length
 
       - name: Style Check
         run: make test/styling

.github/workflows/codeql.yml

@@ -81,8 +81,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          vcpkg --x-wait-for-lock integrate install
-          vcpkg --x-wait-for-lock install
+          make dependencies
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
@@ -112,12 +111,7 @@ jobs:
         shell: bash
         run: |
           export VCPKG_ROOT=/usr/local/share/vcpkg
-          cmake --preset debug -B build
-          cmake --preset debug \
-            -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
-            build
-          cmake --build build --verbose
+          make build
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

.github/workflows/cpp-coverage.yml

@@ -32,19 +32,13 @@ jobs:
 
       - name: Install dependencies
         run: |
-          vcpkg --x-wait-for-lock integrate install
-          vcpkg --x-wait-for-lock install
+          make dependencies
 
       # yamllint disable rule:line-length
       - name: Build
         run: |
           export VCPKG_ROOT=/usr/local/share/vcpkg
-          cmake --preset debug -B build
-          cmake --preset debug \
-            -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
-            build
-          cmake --build build --verbose
+          make build
       # yamllint enable rule:line-length
 
       - name: Test / Coverage

.github/workflows/cpp.yml

@@ -34,19 +34,13 @@ jobs:
 
       - name: Install dependencies
         run: |
-          vcpkg --x-wait-for-lock integrate install
-          vcpkg --x-wait-for-lock install
+          make dependencies
 
       # yamllint disable rule:line-length
       - name: Build
         run: |
           export VCPKG_ROOT=/usr/local/share/vcpkg
-          cmake --preset debug -B build
-          cmake --preset debug \
-            -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
-            build
-          cmake --build build --verbose
+          make build
       # yamllint enable rule:line-length
 
       - name: Test

.github/workflows/cppcheck.yml

@@ -19,11 +19,22 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
-      - name: Install dependencies
+      - name: Install tools
+        run: |
+          sudo snap install cppcheck
+
+      - name: Check Tools
         run: |
-          sudo apt-get update
-          sudo apt-get install cppcheck
+          make --version
+          cmake --version
+          vcpkg --version
           cppcheck --version
 
+      - name: Install dependencies
+        run: |
+          make dependencies
+
       - name: Lint
-        run: make test/static
+        run: |
+          export VCPKG_ROOT=/usr/local/share/vcpkg
+          make test/static

CMakeLists.txt

@@ -11,8 +11,8 @@ list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure")
 include(CTest)
 
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED on)
-set(VCPKG_MANIFEST_INSTALL OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 SET(GCC_COVERAGE_COMPILE_FLAGS "-fsanitize=address -fprofile-arcs -ftest-coverage -g -O0")
 SET(GCC_COVERAGE_LINK_FLAGS "--coverage")

CMakePresets.json

@@ -10,7 +10,6 @@
       },
       "generator": "Unix Makefiles",
       "binaryDir": "${sourceDir}/build/default"
-
     }
   ]
 }

Makefile

@@ -55,9 +55,10 @@ clean:
 	touch ./coverage/.gitkeep
 	sh -c "rm -fr -v ./vcpkg_installed" || true
 
-build: dependencies
-	cmake --preset debug -B build && \
-	cmake --preset debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1 build && \
+prebuild: dependencies
+	cmake --preset debug -B build
+
+build: prebuild
 	cmake --build build --verbose
 
 dependencies:
@@ -72,17 +73,18 @@ lint/yaml:
 
 lint: lint/markdown lint/yaml test/styling test/static
 
-test/static:
+test/static: prebuild
 	cppcheck \
+		--project=build/compile_commands.json \
 		--enable=all \
+		--check-level=exhaustive \
 		--std=c++17 \
 		--library=posix \
 		--inconclusive \
 		--inline-suppr \
 		--error-exitcode=13 \
 		--suppress=missingIncludeSystem \
-		--showtime=summary \
-		src/
+		--showtime=summary
 
 test/styling:
 	clang-format --dry-run --Werror $(FILES)

src/lib/exercises/include/exercises/hackerrank/warmup/mini_max_sum.hpp

@@ -5,5 +5,5 @@
 
 namespace hackerrank::warmup {
 std::string miniMaxSumCalculate(const std::vector<int> &arr);
-void miniMaxSum(const std::vector<int> &ar);
+void miniMaxSum(const std::vector<int> &arr);
 } // namespace hackerrank::warmup