From 92fe97d45dbe77c06c5cc5fed9590cca310526a5 Mon Sep 17 00:00:00 2001 From: PeterPetrik Date: Mon, 16 Jun 2025 16:55:14 +0200 Subject: [PATCH 1/4] bump win machines to 2022 --- .github/workflows/python_packages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python_packages.yml b/.github/workflows/python_packages.yml index b5decafa..0a412bea 100644 --- a/.github/workflows/python_packages.yml +++ b/.github/workflows/python_packages.yml @@ -83,9 +83,9 @@ jobs: build_windows_wheels: name: Build wheels on windows-latest - runs-on: windows-2019 + runs-on: windows-2022 env: - CMAKE_GENERATOR: "Visual Studio 16 2019" + CMAKE_GENERATOR: "Visual Studio 17 2022" SQLite3_ROOT: "C:/vcpkg/installed/x64-windows" CIBW_SKIP: cp27-* cp35-* cp36-* *-win32 CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()" @@ -116,9 +116,9 @@ jobs: build_windows_32_wheels: name: Build 32bit wheels on windows-latest - runs-on: windows-2019 + runs-on: windows-2022 env: - CMAKE_GENERATOR: "Visual Studio 16 2019" + CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "Win32" SQLite3_ROOT: "C:/vcpkg/installed/x86-windows" CIBW_SKIP: cp27-* cp35-* cp36-* pp* *-win_amd64 From 03a73ac8bad70b7fa15ed0fbe036a7ba0fa08b36 Mon Sep 17 00:00:00 2001 From: PeterPetrik Date: Mon, 16 Jun 2025 17:00:27 +0200 Subject: [PATCH 2/4] update pg 17 --- .github/workflows/build_options_test.yml | 2 +- .github/workflows/coverage_tests.yml | 4 ++-- .github/workflows/memcheck_tests.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_options_test.yml b/.github/workflows/build_options_test.yml index 1022f70b..710f363c 100644 --- a/.github/workflows/build_options_test.yml +++ b/.github/workflows/build_options_test.yml @@ -18,7 +18,7 @@ jobs: sudo apt-get update sudo apt-get install libpq-dev sudo apt-get install libc6-dbg gdb - sudo apt-get install postgresql-14 postgresql-contrib-14 postgresql-14-postgis-3 postgresql-common postgis + sudo apt-get install postgresql-17 postgresql-contrib-17 postgresql-17-postgis-3 postgresql-common postgis - name: build geodiff static only run: | diff --git a/.github/workflows/coverage_tests.yml b/.github/workflows/coverage_tests.yml index 9b4ecc74..3f3632b8 100644 --- a/.github/workflows/coverage_tests.yml +++ b/.github/workflows/coverage_tests.yml @@ -18,12 +18,12 @@ jobs: sudo apt-get update sudo apt-get install -y lcov sudo apt-get install libpq-dev - sudo apt-get install postgresql-14 postgresql-contrib-14 postgresql-14-postgis-3 postgresql-common postgis + sudo apt-get install postgresql-17 postgresql-contrib-17 postgresql-17-postgis-3 postgresql-common postgis sudo apt-get install -y python3 python3-pytest libsqlite3-dev cmake cmake-data - name: start PG database run: | - sudo pg_ctlcluster 14 main start + sudo pg_ctlcluster 17 main start sudo pg_lsclusters - name: create PG user diff --git a/.github/workflows/memcheck_tests.yml b/.github/workflows/memcheck_tests.yml index 42a15f3b..0c0cb037 100644 --- a/.github/workflows/memcheck_tests.yml +++ b/.github/workflows/memcheck_tests.yml @@ -18,12 +18,12 @@ jobs: sudo apt-get update sudo apt-get install libpq-dev sudo apt-get install libc6-dbg gdb valgrind - sudo apt-get install postgresql-14 postgresql-contrib-14 postgresql-14-postgis-3 postgresql-common postgis + sudo apt-get install postgresql-17 postgresql-contrib-17 postgresql-17-postgis-3 postgresql-common postgis valgrind --version - name: start PG database run: | - sudo pg_ctlcluster 14 main start + sudo pg_ctlcluster 17 main start sudo pg_lsclusters - name: create PG user From 380872ea67aec684746d2f7de89e928b9a6feb55 Mon Sep 17 00:00:00 2001 From: PeterPetrik Date: Mon, 16 Jun 2025 17:03:32 +0200 Subject: [PATCH 3/4] pg install --- .github/workflows/build_options_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_options_test.yml b/.github/workflows/build_options_test.yml index 710f363c..64a2a5cb 100644 --- a/.github/workflows/build_options_test.yml +++ b/.github/workflows/build_options_test.yml @@ -18,7 +18,7 @@ jobs: sudo apt-get update sudo apt-get install libpq-dev sudo apt-get install libc6-dbg gdb - sudo apt-get install postgresql-17 postgresql-contrib-17 postgresql-17-postgis-3 postgresql-common postgis + sudo apt-get install postgresql postgresql-contrib postgis postgresql-common postgis - name: build geodiff static only run: | From 762234fb4ff33606379bc2a109f0f9576bd1b219 Mon Sep 17 00:00:00 2001 From: PeterPetrik Date: Mon, 16 Jun 2025 17:05:05 +0200 Subject: [PATCH 4/4] pg install --- .github/workflows/coverage_tests.yml | 4 ++-- .github/workflows/memcheck_tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coverage_tests.yml b/.github/workflows/coverage_tests.yml index 3f3632b8..7d165417 100644 --- a/.github/workflows/coverage_tests.yml +++ b/.github/workflows/coverage_tests.yml @@ -18,12 +18,12 @@ jobs: sudo apt-get update sudo apt-get install -y lcov sudo apt-get install libpq-dev - sudo apt-get install postgresql-17 postgresql-contrib-17 postgresql-17-postgis-3 postgresql-common postgis + sudo apt-get install postgresql postgresql-contrib postgis postgresql-common postgis sudo apt-get install -y python3 python3-pytest libsqlite3-dev cmake cmake-data - name: start PG database run: | - sudo pg_ctlcluster 17 main start + sudo pg_ctlcluster 16 main start sudo pg_lsclusters - name: create PG user diff --git a/.github/workflows/memcheck_tests.yml b/.github/workflows/memcheck_tests.yml index 0c0cb037..adb58f79 100644 --- a/.github/workflows/memcheck_tests.yml +++ b/.github/workflows/memcheck_tests.yml @@ -18,12 +18,12 @@ jobs: sudo apt-get update sudo apt-get install libpq-dev sudo apt-get install libc6-dbg gdb valgrind - sudo apt-get install postgresql-17 postgresql-contrib-17 postgresql-17-postgis-3 postgresql-common postgis + sudo apt-get install postgresql postgresql-contrib postgis postgresql-common postgis valgrind --version - name: start PG database run: | - sudo pg_ctlcluster 17 main start + sudo pg_ctlcluster 16 main start sudo pg_lsclusters - name: create PG user