Merge branch 'master' into svg-group-render

This commit is contained in:
Artem Pavlenko 2022-11-24 09:55:44 +00:00
commit b3ed2280b6
3 changed files with 9 additions and 9 deletions

View file

@ -23,7 +23,7 @@ jobs:
name: Windows memory mapped
uses: ./.github/workflows/windows.yml
with:
VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
VCPKG_SHA: 34d2cf7e62d781f4bcb9c7f44f4d2389f568e92b
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: "ON"
@ -35,7 +35,7 @@ jobs:
name: Windows file based
uses: ./.github/workflows/windows.yml
with:
VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
VCPKG_SHA: 34d2cf7e62d781f4bcb9c7f44f4d2389f568e92b
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: "OFF"
@ -47,7 +47,7 @@ jobs:
name: Linux memory mapped
uses: ./.github/workflows/ubuntu.yml
with:
VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
VCPKG_SHA: 34d2cf7e62d781f4bcb9c7f44f4d2389f568e92b
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: "ON"
@ -59,7 +59,7 @@ jobs:
name: Linux file based
uses: ./.github/workflows/ubuntu.yml
with:
VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
VCPKG_SHA: 34d2cf7e62d781f4bcb9c7f44f4d2389f568e92b
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: "OFF"
@ -71,7 +71,7 @@ jobs:
name: MacOS memory mapped
uses: ./.github/workflows/macos.yml
with:
VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
VCPKG_SHA: 34d2cf7e62d781f4bcb9c7f44f4d2389f568e92b
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: "ON"
@ -83,7 +83,7 @@ jobs:
name: MacOS file based
uses: ./.github/workflows/macos.yml
with:
VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
VCPKG_SHA: 34d2cf7e62d781f4bcb9c7f44f4d2389f568e92b
NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
NUGET_USERNAME: mapnik
USE_MEMORY_MAPPED_FILE: "OFF"

View file

@ -32,7 +32,7 @@ jobs:
steps:
- name: Install required system packages
run: |
brew install automake ninja lcov
brew install automake ninja lcov autoconf-archive
- name: checkout mapnik
uses: actions/checkout@v3

View file

@ -28,7 +28,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
services:
postgres:
@ -48,7 +48,7 @@ jobs:
- name: Install required system packages
shell: "bash"
run: |
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 autoconf-archive
- name: checkout mapnik
uses: actions/checkout@v3