From 7d414450c168d0163f1fbbaaab050cad7d43ad68 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 21 Nov 2022 22:09:04 +0100 Subject: [PATCH 1/4] update vcpkg hash --- .github/workflows/build_test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index c8e07c0d3..7b208586d 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -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" From 6183005bafd7f7bf340ce0505538a8fafe0a3e9b Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 21 Nov 2022 22:28:44 +0100 Subject: [PATCH 2/4] [CI] update gh action runners --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 092d10c45..be9865f8b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7035afda7..8305e084b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -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 From 817f644c6d5583ad6c67461394b6d3d7190b4929 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 21 Nov 2022 22:40:46 +0100 Subject: [PATCH 3/4] update pre-commit versions --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0df4f091e..90029c249 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: files: ^.*\.cmake|CMakeLists\.txt$ - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.6 + rev: v15.0.4 hooks: - id: clang-format types_or: [c++, c] From 07789ad3cc08b929b556f71ff56351df7781ecd3 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 22 Nov 2022 11:45:23 +0100 Subject: [PATCH 4/4] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 90029c249..0df4f091e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: files: ^.*\.cmake|CMakeLists\.txt$ - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v15.0.4 + rev: v14.0.6 hooks: - id: clang-format types_or: [c++, c]