Merge pull request #11190 from camptocamp/qgis-version

Update the used QGIS version
camptocamp · Jun 26, 2024 · 1e51783 · 1e51783
2 parents f583464 + ced32c7
commit 1e51783
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -91,8 +91,8 @@ jobs:
       - run: make build-config
 
         # Build and lint QGIS images
-      - run: QGIS_VERSION=3.28-gdal3.7 make build-qgisserver
-      - run: QGIS_VERSION=3.28-gdal3.7 make prospector-qgisserver
+      - run: QGIS_VERSION=3.34-gdal3.8 make build-qgisserver
+      - run: QGIS_VERSION=3.34-gdal3.8 make prospector-qgisserver
 
         # Tests
       - run: make preparetest

diff --git a/ci/create-new-project b/ci/create-new-project
@@ -11,9 +11,9 @@ docker tag "camptocamp/geomapfish:${TAG}" "camptocamp/geomapfish:$(scripts/get-v
 docker tag "camptocamp/geomapfish-tools:${TAG}" "camptocamp/geomapfish-tools:$(scripts/get-version --full)"
 docker tag "camptocamp/geomapfish-config:${TAG}" "camptocamp/geomapfish-config:$(scripts/get-version --major-minor)"
 
-DOCKER_BUILDKIT=1 docker build --target=runner --build-arg=VERSION=3.28-gdal3.6 \
+DOCKER_BUILDKIT=1 docker build --target=runner --build-arg=VERSION=3.34-gdal3.8 \
     --build-arg="GEOMAPFISH_VERSION=${TAG}" \
-    --tag="camptocamp/geomapfish-qgisserver:gmf${TAG}-qgis3.28-gdal3.6" \
+    --tag="camptocamp/geomapfish-qgisserver:gmf${TAG}-qgis3.34-gdal3.8" \
     docker/qgisserver
 
 WORKSPACE=$1

diff --git a/doc/integrator/backend_qgis.rst b/doc/integrator/backend_qgis.rst
@@ -217,7 +217,7 @@ With that you will not have URL encoding issues.
 Landing page
 ============
 
-`The QGIS documentation <https://docs.qgis.org/3.28/en/docs/server_manual/services.html#qgis-server-catalog>`_.
+`The QGIS documentation <https://docs.qgis.org/latest/en/docs/server_manual/services.html#qgis-server-catalog>`_.
 
 To have the landing page you should:
 

diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default b/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default
@@ -46,7 +46,7 @@ TILECLOUDCHAIN_INTERNAL_PORT=8080
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/
 QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
-QGIS_VERSION=3.28-gdal3.7
+QGIS_VERSION=3.34-gdal3.8
 POSTGRES_TAG=13-postgis-3
 
 DEVSERVER_HOST=webpack_dev_server:8080