From 0897271a8e9a327b1d02005ef291a2744ef2c61c Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Tue, 16 Apr 2024 09:24:55 +0100 Subject: [PATCH] upgrade vcpkg-sha : b4a3d89125e45bc8f80fb94bef9761d4f4e14fb9 + reduce number of runners for now. --- .github/workflows/build_and_test.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 440688e22..4df76c2bf 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -36,22 +36,15 @@ jobs: fail-fast: false matrix: os: [macos-latest, windows-latest, ubuntu-latest] - memory-mapped: ["OFF", "ON"] - static-build: ["OFF", "ON"] - cxx-standard: [14] + memory-mapped: ["ON"] + static-build: ["OFF"] + cxx-standard: [17] include: - os: ubuntu-latest mono: mono - os: macos-latest mono: mono - - os: macos-latest - cxx-standard: 17 - mono: mono - - os: ubuntu-latest - cxx-standard: 17 - mono: mono - os: windows-latest - cxx-standard: 17 runs-on: ${{ matrix.os }} @@ -80,7 +73,7 @@ jobs: - name: setup vcpkg uses: ./.github/actions/setup_vcpkg with: - vcpkg-sha: e105a86c97b8ab13d4dbe3f7bd9ebc17ece31634 + vcpkg-sha: b4a3d89125e45bc8f80fb94bef9761d4f4e14fb9 nuget-source: https://nuget.pkg.github.com/mapnik/index.json nuget-username: ${{ github.actor }} nuget-pat: ${{ secrets.GITHUB_TOKEN }} @@ -101,7 +94,7 @@ jobs: run: | cmake \ -DBUILD_SHARED_LIBS:BOOL=${{ matrix.static-build || 'ON' }} \ - -DCMAKE_CXX_STANDARD=${{ matrix.cxx-standard || '14' }} \ + -DCMAKE_CXX_STANDARD=${{ matrix.cxx-standard }} \ -DUSE_MEMORY_MAPPED_FILE:BOOL=${{ matrix.memory-mapped || 'ON' }} \ -LA \ --preset ${{ env.PRESET }}