diff --git a/.github/workflows/cpp-coverage.yml b/.github/workflows/cpp-coverage.yml index 1c5c496..19a5831 100644 --- a/.github/workflows/cpp-coverage.yml +++ b/.github/workflows/cpp-coverage.yml @@ -13,16 +13,29 @@ on: # yamllint disable-line rule:truthy jobs: coverage: name: C++ CMake CI Coverage - runs-on: ubuntu-24.04 + runs-on: macos-14 steps: - name: Checkout repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - name: Install Tools + shell: bash run: | - sudo apt update - sudo apt-get install lcov + # Install vcpkg + export VCPKG_VERSION=2025.02.14 + git clone \ + --depth 1 \ + --branch $VCPKG_VERSION \ + https://github.com/microsoft/vcpkg.git \ + --single-branch \ + "$HOME/vcpkg" + export VCPKG_ROOT="$HOME/vcpkg" + echo "$VCPKG_ROOT" >> $GITHUB_PATH + sh $VCPKG_ROOT/bootstrap-vcpkg.sh + echo "VCPKG_ROOT=$HOME/vcpkg" >> $GITHUB_ENV + # lcov is available via homebrew + brew install lcov - name: Check Tools run: | diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 6298c3d..e126f4b 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-24.04 env: # Directory where build-wrapper output will be placed - BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory + BUILD_WRAPPER_OUT_DIR: build steps: - uses: actions/checkout@v5 with: @@ -64,6 +64,6 @@ jobs: with: # Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options args: > - --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json" + --define sonar.cfamily.compile-commands=${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json --define sonar.coverageReportPaths=coverage.xml # yamllint enable rule:line-length