From c7276b092bd710d00f9580412af755f2588e11b8 Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Thu, 23 Feb 2023 07:52:51 +0100 Subject: [PATCH 1/6] Update docker tests to actual postgres postgis versions Update docker tests to actual postgres postgis versions --- .github/workflows/docker-test-and-push.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-test-and-push.yaml b/.github/workflows/docker-test-and-push.yaml index 6d81c741..60f6e666 100644 --- a/.github/workflows/docker-test-and-push.yaml +++ b/.github/workflows/docker-test-and-push.yaml @@ -16,21 +16,21 @@ on: jobs: docker-tests: name: Docker - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: matrix: # postgres-postgis version, see available tags https://hub.docker.com/r/postgis/postgis/tags pgis: - - 9.6-3.2 - - 10-3.2 + - 10-2.6 - 11-3.2 - - 12-3.2 + - 14-3.2 + - 15-3.3 fail-fast: false env: # which pgis version to use for :tag images (must be in the matrix above) - pgis_stable: "11-2.5" + pgis_stable: "14-3.2" steps: - uses: actions/checkout@v2 From 60ee215f6c40ba752935e2e63f6d27cdd0b40cf8 Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Thu, 23 Feb 2023 13:01:55 +0100 Subject: [PATCH 2/6] Adjust docker image tags Adjust docker image tags --- .github/workflows/docker-test-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-and-push.yaml b/.github/workflows/docker-test-and-push.yaml index 60f6e666..3fba6dc5 100644 --- a/.github/workflows/docker-test-and-push.yaml +++ b/.github/workflows/docker-test-and-push.yaml @@ -22,7 +22,7 @@ jobs: matrix: # postgres-postgis version, see available tags https://hub.docker.com/r/postgis/postgis/tags pgis: - - 10-2.6 + - 10-2.5 - 11-3.2 - 14-3.2 - 15-3.3 From 68375e4c1bd8617e1284f0c9e9fa8e1b19fe22fa Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Fri, 24 Feb 2023 14:52:40 +0100 Subject: [PATCH 3/6] Remove postgis 2.5 since it isn't supported by the CI already Remove postgis 2.5 since it isn't supported by the CI already Test actions/checkout@v3 --- .github/workflows/docker-test-and-push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-and-push.yaml b/.github/workflows/docker-test-and-push.yaml index 3fba6dc5..eb950b6e 100644 --- a/.github/workflows/docker-test-and-push.yaml +++ b/.github/workflows/docker-test-and-push.yaml @@ -22,7 +22,7 @@ jobs: matrix: # postgres-postgis version, see available tags https://hub.docker.com/r/postgis/postgis/tags pgis: - - 10-2.5 + - 10-3.2 - 11-3.2 - 14-3.2 - 15-3.3 @@ -33,7 +33,7 @@ jobs: pgis_stable: "14-3.2" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: "assert version is up to date" run: | From a16815932ceecbb51c2e2f8d0445d5e7f793e9bb Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Fri, 24 Feb 2023 14:53:24 +0100 Subject: [PATCH 4/6] Upgade Dockerfile to LTR Upgade Dockerfile to LTR --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 20c94fdf..4d505929 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,4 +1,4 @@ -ARG POSTGIS_VERSION=11-3.2 +ARG POSTGIS_VERSION=14-3.2 FROM postgis/postgis:${POSTGIS_VERSION} # System deps From c3ab8f947e7dcfd66a5c8cb67f3d13dbd7ea5de6 Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Mon, 21 Aug 2023 14:52:16 +0200 Subject: [PATCH 5/6] Add postgis 3.4 as future Add postgis 3.4 as future --- .github/workflows/docker-test-and-push.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-and-push.yaml b/.github/workflows/docker-test-and-push.yaml index d1c59b46..b669a256 100644 --- a/.github/workflows/docker-test-and-push.yaml +++ b/.github/workflows/docker-test-and-push.yaml @@ -25,7 +25,8 @@ jobs: # WARNING: if changing this, make sure tu update `pgis_stable` below - 13-3.2 - 14-3.2 - - 15-3.3 + - 14-3.3 + - 15-3.4 fail-fast: false env: From 03d873d6dddf1eca85c266aac9f25e24ba35e86f Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Thu, 22 Aug 2024 08:19:30 +0200 Subject: [PATCH 6/6] update postgres/postgis versions for CI --- .github/workflows/docker-test-and-push.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-and-push.yaml b/.github/workflows/docker-test-and-push.yaml index 18fbfb0c..45d9e224 100644 --- a/.github/workflows/docker-test-and-push.yaml +++ b/.github/workflows/docker-test-and-push.yaml @@ -23,10 +23,9 @@ jobs: # postgres-postgis version, see available tags https://hub.docker.com/r/postgis/postgis/tags pgis: # WARNING: if changing this, make sure tu update `pgis_stable` below - - 13-3.2 - 14-3.2 - - 14-3.3 - 15-3.4 + - 16-3.4 #- 15-3.3 # Postgis 3.3 requires QGEP datamodel adaptations # See https://github.com/QGEP/QGEP/issues/825 fail-fast: false