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

Merge pull request #4390 from mapnik/feature/updateVcpkg

Browse source 
Update vcpkg commit ref in the ci
This commit is contained in:
Artem Pavlenko 2023-06-12 08:29:12 +01:00 • committed by GitHub
commit 123232ffde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,7 @@ jobs:
- name: setup vcpkg - name: setup vcpkg
uses: ./.github/actions/setup_vcpkg uses: ./.github/actions/setup_vcpkg
with: with:
vcpkg-sha: 71d3fa60b67540e9bf5fde2bf2188f579ff09433 vcpkg-sha: a960fde0b60b6392d70375fe513dfa7eb083cc3a
nuget-source: https://nuget.pkg.github.com/mapnik/index.json nuget-source: https://nuget.pkg.github.com/mapnik/index.json
nuget-username: ${{ github.actor }} nuget-username: ${{ github.actor }}
nuget-pat: ${{ secrets.GITHUB_TOKEN }} nuget-pat: ${{ secrets.GITHUB_TOKEN }}

1
benchmark/src/test_font_registration.cpp
View file

@ -1,7 +1,6 @@
#include "bench_framework.hpp" #include "bench_framework.hpp"
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/foreach.hpp>
class test : public benchmark::test_case class test : public benchmark::test_case
{ {