sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use unnamed workflows, move vcpkg into preset update vcpkg

Browse source
This commit is contained in:
Mathis Logemann 2022-04-11 15:04:30 +02:00
parent 1bba69b108
commit 2259f8da6f
5 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/build_test.yml vendored
View file

@ -11,9 +11,9 @@ on:
jobs: jobs:
windows: windows:
name: Windows memory mapped name: Windows memory mapped
uses: mapnik/mapnik/.github/workflows/windows.yml@master uses: ./.github/workflows/windows.yml
with: with:
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'ON' USE_MEMORY_MAPPED_FILE: 'ON'
@ -22,9 +22,9 @@ jobs:
windows-mmf-off: windows-mmf-off:
name: Windows file based name: Windows file based
uses: mapnik/mapnik/.github/workflows/windows.yml@master uses: ./.github/workflows/windows.yml
with: with:
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'OFF' USE_MEMORY_MAPPED_FILE: 'OFF'
@ -33,9 +33,9 @@ jobs:
ubuntu: ubuntu:
name: Linux memory mapped name: Linux memory mapped
uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master uses: ./.github/workflows/ubuntu.yml
with: with:
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'ON' USE_MEMORY_MAPPED_FILE: 'ON'
@ -44,9 +44,9 @@ jobs:
ubuntu-mmf-off: ubuntu-mmf-off:
name: Linux file based name: Linux file based
uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master uses: ./.github/workflows/ubuntu.yml
with: with:
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'OFF' USE_MEMORY_MAPPED_FILE: 'OFF'
@ -55,9 +55,9 @@ jobs:
macos: macos:
name: MacOS memory mapped name: MacOS memory mapped
uses: mapnik/mapnik/.github/workflows/macos.yml@master uses: ./.github/workflows/macos.yml
with: with:
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'ON' USE_MEMORY_MAPPED_FILE: 'ON'
@ -66,9 +66,9 @@ jobs:
macos-mmf-off: macos-mmf-off:
name: MacOS file based name: MacOS file based
uses: mapnik/mapnik/.github/workflows/macos.yml@master uses: ./.github/workflows/macos.yml
with: with:
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8 VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'OFF' USE_MEMORY_MAPPED_FILE: 'OFF'

10
.github/workflows/macos.yml vendored
View file

@ -35,12 +35,12 @@ jobs:
brew install automake ninja lcov brew install automake ninja lcov
- name: checkout mapnik - name: checkout mapnik
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
submodules: "recursive" submodules: "recursive"
- name: checkout vcpkg - name: checkout vcpkg
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: "microsoft/vcpkg" repository: "microsoft/vcpkg"
ref: ${{ inputs.VCPKG_SHA }} ref: ${{ inputs.VCPKG_SHA }}
@ -89,7 +89,7 @@ jobs:
setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}" setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}"
- name: Configure CMake - 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 - name: Build
run: cmake --build --preset ${{ env.preset }} run: cmake --build --preset ${{ env.preset }}
@ -131,7 +131,7 @@ jobs:
run: cmake --build --preset ${{ env.preset }} --target package run: cmake --build --preset ${{ env.preset }} --target package
- name: Upload mapnik build artifact - name: Upload mapnik build artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
if: failure() if: failure()
with: with:
name: ${{ env.preset }}-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} name: ${{ env.preset }}-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
@ -139,7 +139,7 @@ jobs:
retention-days: 2 retention-days: 2
- name: Upload visual test results - name: Upload visual test results
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
path: build/${{ env.preset }}/out/visual-test-results.tar.gz path: build/${{ env.preset }}/out/visual-test-results.tar.gz

10
.github/workflows/ubuntu.yml vendored
View file

@ -51,12 +51,12 @@ jobs:
sudo apt-get install -y gperf libxxf86vm-dev ninja-build postgresql-client lcov sudo apt-get install -y gperf libxxf86vm-dev ninja-build postgresql-client lcov
- name: checkout mapnik - name: checkout mapnik
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
submodules: "recursive" submodules: "recursive"
- name: checkout vcpkg - name: checkout vcpkg
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: "microsoft/vcpkg" repository: "microsoft/vcpkg"
ref: ${{ inputs.VCPKG_SHA }} ref: ${{ inputs.VCPKG_SHA }}
@ -105,7 +105,7 @@ jobs:
setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}" setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}"
- name: Configure CMake - 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 - name: Build
run: cmake --build --preset ${{ env.preset }} run: cmake --build --preset ${{ env.preset }}
@ -147,7 +147,7 @@ jobs:
run: cmake --build --preset ${{ env.preset }} --target package run: cmake --build --preset ${{ env.preset }} --target package
- name: Upload mapnik build artifact - name: Upload mapnik build artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
if: failure() if: failure()
with: with:
name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
@ -155,7 +155,7 @@ jobs:
retention-days: 2 retention-days: 2
- name: Upload visual test results - name: Upload visual test results
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
path: build/${{ env.preset }}/out/visual-test-results.tar.gz path: build/${{ env.preset }}/out/visual-test-results.tar.gz

10
.github/workflows/windows.yml vendored
View file

@ -38,12 +38,12 @@ jobs:
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
- name: checkout mapnik - name: checkout mapnik
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
submodules: "recursive" submodules: "recursive"
- name: checkout vcpkg - name: checkout vcpkg
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: "microsoft/vcpkg" repository: "microsoft/vcpkg"
ref: ${{ inputs.VCPKG_SHA }} ref: ${{ inputs.VCPKG_SHA }}
@ -91,7 +91,7 @@ jobs:
setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}" setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}"
- name: Configure CMake - 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 - name: Build
run: cmake --build --preset ${{env.preset}} run: cmake --build --preset ${{env.preset}}
@ -120,7 +120,7 @@ jobs:
if: failure() if: failure()
run: cmake --build --preset ${{env.preset}} --target package run: cmake --build --preset ${{env.preset}} --target package
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
if: failure() if: failure()
with: with:
name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
@ -128,7 +128,7 @@ jobs:
retention-days: 2 retention-days: 2
- name: Upload visual test results - name: Upload visual test results
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }} name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
path: build/${{ env.preset }}/out/visual-test-results.tar.gz path: build/${{ env.preset }}/out/visual-test-results.tar.gz

3
CMakePresets.json
View file

@ -179,7 +179,8 @@
"hidden": true, "hidden": true,
"cacheVariables": { "cacheVariables": {
"BUILD_TESTING": "ON", "BUILD_TESTING": "ON",
"BUILD_DEMO_VIEWER": "OFF" "BUILD_DEMO_VIEWER": "OFF",
"CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake"
} }
}, },
{ {