diff --git a/.github/workflows/cpp-macos.yml b/.github/workflows/cpp-macos.yml index 9b8193c..3cf7221 100644 --- a/.github/workflows/cpp-macos.yml +++ b/.github/workflows/cpp-macos.yml @@ -24,16 +24,17 @@ jobs: - name: Install shell: bash run: | - if [ "$RUNNER_OS" == "macOS" ]; then - brew install vcpkg - git clone https://github.com/microsoft/vcpkg "$HOME/vcpkg" - export VCPKG_ROOT="$HOME/vcpkg" - echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV - elif [ "$RUNNER_OS" == "Linux" ]; then - echo "VCPKG_ROOT=/usr/local/share/vcpkg" >> $GITHUB_ENV - elif [ "$RUNNER_OS" == "Windows" ]; then - echo "VCPKG_ROOT=C:/vcpkg" >> $GITHUB_ENV - fi + export VCPKG_VERSION=2024.12.16 + brew install vcpkg + git clone \ + --depth 1 \ + --branch $VCPKG_VERSION \ + https://github.com/microsoft/vcpkg.git \ + --single-branch \ + "$HOME/vcpkg" + export VCPKG_ROOT="$HOME/vcpkg" + sh $VCPKG_ROOT/bootstrap-vcpkg.sh + echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV - name: Check Tools run: | diff --git a/Makefile b/Makefile index 3c8f340..f0c3529 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,9 @@ clean: touch ./coverage/.gitkeep sh -c "rm -fr -v ./vcpkg_installed" || true +clean/test: + find . -name "*.gcda" -print -delete || true + prebuild: dependencies cmake --preset debug -B build @@ -92,7 +95,7 @@ test/styling: format: clang-format -i --verbose $(FILES) -test: env dependencies build +test: env dependencies build clean/test cd build && make test coverage: test