diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 5ad346ff0..dfaa9be28 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -11,9 +11,9 @@ on: jobs: windows: name: Windows memory mapped - uses: mapnik/mapnik/.github/workflows/windows.yml@master + uses: ./.github/workflows/windows.yml with: - VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 + VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_USERNAME: mapnik USE_MEMORY_MAPPED_FILE: 'ON' @@ -22,9 +22,9 @@ jobs: windows-mmf-off: name: Windows file based - uses: mapnik/mapnik/.github/workflows/windows.yml@master + uses: ./.github/workflows/windows.yml with: - VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 + VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_USERNAME: mapnik USE_MEMORY_MAPPED_FILE: 'OFF' @@ -33,9 +33,9 @@ jobs: ubuntu: name: Linux memory mapped - uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master + uses: ./.github/workflows/ubuntu.yml with: - VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 + VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_USERNAME: mapnik USE_MEMORY_MAPPED_FILE: 'ON' @@ -44,9 +44,9 @@ jobs: ubuntu-mmf-off: name: Linux file based - uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master + uses: ./.github/workflows/ubuntu.yml with: - VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 + VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_USERNAME: mapnik USE_MEMORY_MAPPED_FILE: 'OFF' @@ -55,9 +55,9 @@ jobs: macos: name: MacOS memory mapped - uses: mapnik/mapnik/.github/workflows/macos.yml@master + uses: ./.github/workflows/macos.yml with: - VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 + VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_USERNAME: mapnik USE_MEMORY_MAPPED_FILE: 'ON' @@ -66,9 +66,9 @@ jobs: macos-mmf-off: name: MacOS file based - uses: mapnik/mapnik/.github/workflows/macos.yml@master + uses: ./.github/workflows/macos.yml with: - VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 + VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_USERNAME: mapnik USE_MEMORY_MAPPED_FILE: 'OFF' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a2a3d959f..092d10c45 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,12 +35,12 @@ jobs: brew install automake ninja lcov - name: checkout mapnik - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: "recursive" - name: checkout vcpkg - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: "microsoft/vcpkg" ref: ${{ inputs.VCPKG_SHA }} @@ -89,7 +89,7 @@ jobs: setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}" - name: Configure CMake - run: cmake -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }} + run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }} - name: Build run: cmake --build --preset ${{ env.preset }} @@ -131,7 +131,7 @@ jobs: run: cmake --build --preset ${{ env.preset }} --target package - name: Upload mapnik build artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: ${{ env.preset }}-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} @@ -139,7 +139,7 @@ jobs: retention-days: 2 - name: Upload visual test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} path: build/${{ env.preset }}/out/visual-test-results.tar.gz diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8fb246bf1..7035afda7 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -51,12 +51,12 @@ jobs: sudo apt-get install -y gperf libxxf86vm-dev ninja-build postgresql-client lcov - name: checkout mapnik - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: "recursive" - name: checkout vcpkg - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: "microsoft/vcpkg" ref: ${{ inputs.VCPKG_SHA }} @@ -105,7 +105,7 @@ jobs: setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}" - name: Configure CMake - run: cmake -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }} + run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }} - name: Build run: cmake --build --preset ${{ env.preset }} @@ -147,7 +147,7 @@ jobs: run: cmake --build --preset ${{ env.preset }} --target package - name: Upload mapnik build artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} @@ -155,7 +155,7 @@ jobs: retention-days: 2 - name: Upload visual test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} path: build/${{ env.preset }}/out/visual-test-results.tar.gz diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 44f1ef6bb..2ad229ddf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -38,12 +38,12 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: checkout mapnik - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: "recursive" - name: checkout vcpkg - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: "microsoft/vcpkg" ref: ${{ inputs.VCPKG_SHA }} @@ -91,7 +91,7 @@ jobs: setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}" - name: Configure CMake - run: cmake -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset ${{env.preset}} + run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset ${{env.preset}} - name: Build run: cmake --build --preset ${{env.preset}} @@ -120,7 +120,7 @@ jobs: if: failure() run: cmake --build --preset ${{env.preset}} --target package - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: failure() with: name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} @@ -128,7 +128,7 @@ jobs: retention-days: 2 - name: Upload visual test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} path: build/${{ env.preset }}/out/visual-test-results.tar.gz diff --git a/CMakePresets.json b/CMakePresets.json index 0b21f4631..61a84d330 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -179,7 +179,8 @@ "hidden": true, "cacheVariables": { "BUILD_TESTING": "ON", - "BUILD_DEMO_VIEWER": "OFF" + "BUILD_DEMO_VIEWER": "OFF", + "CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake" } }, {