Merge branch 'qgis:master' into hana_provider

.ci/run_tests.sh

@@ -2,15 +2,11 @@
 
 set -e
 
-# check for docker-compose and docker availability
+# check for docker availability
 command -v docker > /dev/null || {
 	echo "Please install docker" >&2
 	exit 1
 }
-command -v docker-compose > /dev/null || {
-	echo "Please install docker-compose" >&2
-	exit 1
-}
 
 IMAGE_BUILD_DEPS=qgis/qgis3-build-deps:latest
 UPDATE_IMAGES=yes
@@ -115,7 +111,7 @@ if test "$(docker images -q qgis3-build-deps-binary-image)" = ""; then
 fi
 
 if test "${INTERACTIVE}" = "no"; then
-  echo "--=[ Running tests via docker-compose"
+  echo "--=[ Running tests via docker compose"
   COMMAND=${QGIS_WORKSPACE_MOUNTPOINT}/.docker/docker-qgis-test.sh
   COMMAND_ARGS="${TESTS_TO_RUN}"
 else
@@ -129,7 +125,7 @@ mkdir -p /tmp/minio_tests/test-bucket && chmod -R 777 /tmp/minio_tests
 # Create an empty webdav folder with appropriate permissions so www user can write inside it
 mkdir -p /tmp/webdav_tests && chmod 777 /tmp/webdav_tests
 
-docker-compose \
+docker compose \
   -f .docker/docker-compose-testing.yml \
   run \
   -w "${QGIS_WORKSPACE_MOUNTPOINT}" \

.docker/qgis3-qt5-build-deps.dockerfile

@@ -152,7 +152,7 @@ RUN  apt-get update \
 
 # HANA: client side
 # Install hdbsql tool
-RUN curl -j -k -L -H "Cookie: eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
+RUN curl -j -k -L -H "Cookie: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
   && tar -xvf hanaclient-latest-linux-x64.tar.gz \
   && mkdir /usr/sap \
   && ./client/hdbinst -a client --sapmnt=/usr/sap \

.github/workflows/code_layout.yml

@@ -162,7 +162,7 @@ jobs:
               silversearcher-ag
 
       - name: Retrieve changed files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v44
         id: changed_files
         with:
           separator: " "

.github/workflows/mingw-w64-msys2.yml

@@ -65,7 +65,6 @@ jobs:
 
       - name: Configure QGIS
         run: |
-          CXXFLAGS="-DQWT_POLAR_VERSION=0x060200" \
           cmake \
             -G"Ninja" \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -74,7 +73,6 @@ jobs:
             -DWITH_DRACO=ON \
             -DWITH_PDAL=OFF \
             -DWITH_CUSTOM_WIDGETS=ON \
-            -DWITH_QWTPOLAR=OFF \
             -DWITH_BINDINGS=OFF \
             -DWITH_GRASS=OFF \
             -DUSE_CCACHE=ON \

.github/workflows/ogc.yml

@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Restore build cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: /home/runner/QGIS/.ccache
           key: build-ccache-ogc-${{ github.event.pull_request.base.ref || github.ref_name }}
@@ -72,7 +72,7 @@ jobs:
           DOCKER_IMAGE: ${{ steps.docker-build.outputs.imageid }}
 
       - name: Save build cache for push only
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: ${{ github.event_name == 'push' }}
         with:
           path: /home/runner/QGIS/.ccache
@@ -88,15 +88,15 @@ jobs:
       - name: Run WMS 1.3.0 OGC tests
         run: |
           source venv/bin/activate && ./pyogctest/pyogctest.py -s wms130 -e
-          docker-compose -f .ci/ogc/docker-compose.yml up -d
+          docker compose -f .ci/ogc/docker-compose.yml up -d
           source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s wms130 -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver_wms130
         env:
           DOCKER_IMAGE: ${{ steps.docker-build.outputs.imageid }}
 
       - name: Run OGC API Features 1.0 tests
         run: |
           cd data && git clone https://github.com/qgis/QGIS-Training-Data && cd -
-          docker-compose -f .ci/ogc/docker-compose.yml up -d
+          docker compose -f .ci/ogc/docker-compose.yml up -d
           source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s ogcapif -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver_ogcapif
         env:
           DOCKER_IMAGE: ${{ steps.docker-build.outputs.imageid }}

.github/workflows/run-tests.yml

@@ -116,7 +116,7 @@ jobs:
           echo QT_VERSION: ${QT_VERSION}
 
       - name: Login to Docker Hub
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -129,7 +129,7 @@ jobs:
           context: .
           file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
           tags: qgis/qgis3-build-deps-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}:${{ github.event.pull_request.base.ref || github.ref_name }}
-          push: ${{ github.event_name == 'push' }}
+          push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
           pull: true
           build-args:
             DISTRO_VERSION=${{ matrix.distro-version }}
@@ -347,7 +347,7 @@ jobs:
           echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
 
       - name: Login to Docker Hub
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -360,7 +360,7 @@ jobs:
           context: .
           file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
           tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
-          push: ${{ github.event_name == 'push' }}
+          push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
           pull: true
           target: ${{ matrix.docker-target }}
           build-args:
@@ -407,7 +407,7 @@ jobs:
           echo "DOCKERFILE=$DOCKERFILE"
           mkdir -p /tmp/webdav_tests && chmod 777 /tmp/webdav_tests
           mkdir -p /tmp/minio_tests/test-bucket && chmod -R 777 /tmp/minio_tests
-          docker-compose -f .docker/$DOCKERFILE run -e GITHUB_SHA=$GITHUB_SHA qgis-deps /root/QGIS/.docker/docker-qgis-test.sh $TEST_BATCH
+          docker compose -f .docker/$DOCKERFILE run -e GITHUB_SHA=$GITHUB_SHA qgis-deps /root/QGIS/.docker/docker-qgis-test.sh $TEST_BATCH
 
       - name: Fix permissions on test report
         if: ${{ failure() }}
@@ -458,7 +458,7 @@ jobs:
           fetch-depth: 2
 
       - name: Login to Docker Hub
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -471,7 +471,7 @@ jobs:
           context: .
           file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
           tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
-          push: ${{ github.event_name == 'push' }}
+          push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
           pull: true
           target: ${{ matrix.docker-target }}
           build-args:

.github/workflows/write_failure_comment.yml

@@ -1,9 +1,5 @@
 name: Write test failure comment
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 on:
   workflow_run:
     workflows: [🧪 QGIS tests]

debian/control

@@ -67,7 +67,6 @@ Build-Depends:
  qttools5-dev-tools,
  qttools5-dev,
  git,
- doxygen,
  graphviz,
  xvfb,
  xauth,