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

[CI] update vcpkg to latest hash

Browse source 
notable changes: * proj => v9
[CI] fix sqlite dep

[vcpkg] update hash

update vcpkg cache
This commit is contained in:
Mathis Logemann 2022-03-18 22:56:06 +01:00
parent f3da900c35
commit 1bba69b108
6 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ jobs:
name: Windows memory mapped
uses: mapnik/mapnik/.github/workflows/windows.yml@master
with:
VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'ON'
@ -24,7 +24,7 @@ jobs:
name: Windows file based
uses: mapnik/mapnik/.github/workflows/windows.yml@master
with:
VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'OFF'
@ -35,7 +35,7 @@ jobs:
name: Linux memory mapped
uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
with:
VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'ON'
@ -46,7 +46,7 @@ jobs:
name: Linux file based
uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
with:
VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'OFF'
@ -57,7 +57,7 @@ jobs:
name: MacOS memory mapped
uses: mapnik/mapnik/.github/workflows/macos.yml@master
with:
VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'ON'
@ -68,7 +68,7 @@ jobs:
name: MacOS file based
uses: mapnik/mapnik/.github/workflows/macos.yml@master
with:
VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: 'OFF'

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

@ -101,7 +101,7 @@ jobs:
continue-on-error: true
working-directory: build/${{ env.preset }}/out
env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj4
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
run: ./mapnik-test-visual -j $(sysctl -n hw.logicalcpu) --output-dir ./visual-test-result
- name: Pack visual test results
@ -111,7 +111,7 @@ jobs:
- name: Run Benchmark
working-directory: build/${{ env.preset }}/out
env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj4
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
run: ./run_benchmarks
- name: Coverage

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

@ -117,7 +117,7 @@ jobs:
continue-on-error: true
working-directory: build/${{ env.preset }}/out
env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj4
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
run: ./mapnik-test-visual -j $(nproc) --output-dir ./visual-test-result
- name: Pack visual test results
@ -127,7 +127,7 @@ jobs:
- name: Run Benchmarks
working-directory: build/${{ env.preset }}/out
env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj4
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
run: ./run_benchmarks
- name: Coverage

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

@ -104,7 +104,7 @@ jobs:
continue-on-error: true
working-directory: build/${{ env.preset }}/out
env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj4
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj/data
run: OpenCppCoverage --modules *libmapnik* --modules mapnik*.exe --modules *.input --sources ${{ github.workspace }} --export_type binary --input_coverage=${{ github.workspace }}/ctest.cov --cover_children -- .\mapnik-test-visual.exe -j (Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors --output-dir ./visual-test-result
- name: Pack visual test results

6
CMakePresets.json
View file

@ -194,7 +194,7 @@
"ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin"
},
"environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj4"
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj/data"
}
},
{
@ -209,7 +209,7 @@
"CMAKE_CXX_FLAGS": "--coverage"
},
"environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj4"
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj/data"
}
},
{
@ -225,7 +225,7 @@
"CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
},
"environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj4"
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj/data"
}
}
],

9
vcpkg.json
View file

@ -60,9 +60,14 @@
"mapbox-geometry",
"mapbox-polylabel",
"mapbox-variant",
"proj4",
"proj",
"protozero",
"sqlite3",
{
"name": "sqlite3",
"features": [
"rtree"
]
},
"tiff",
"zlib"
]