fixes merge conflicts

.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}" \

.ci/test_blocklist_qt6.txt

@@ -3,6 +3,7 @@ test_core_compositionconverter
 test_core_expression
 test_core_labelingengine
 test_core_layoutpicture
+# test_core_ogcutils runs fine locally on Fedora:rawhide but not on CI
 test_core_ogcutils
 test_core_vectortilelayer
 test_gui_processinggui
@@ -41,15 +42,12 @@ PyQgsPythonProvider
 PyQgsAnnotation
 PyQgsAuthenticationSystem
 PyQgsBlockingProcess
-PyQgsBookmarkModel
 PyQgsCodeEditor
 PyQgsDelimitedTextProvider
 PyQgsEditWidgets
 PyQgsElevationProfileCanvas
 PyQgsProject
-PyQgsFieldModel
 PyQgsFloatingWidget
-PyQgsJsonUtils
 PyQgsLayoutHtml
 PyQgsLineSymbolLayers
 PyQgsMapBoxGlStyleConverter
@@ -61,7 +59,6 @@ PyQgsRasterAttributeTable
 PyQgsRasterLayerRenderer
 PyQgsShapefileProvider
 PyQgsTextRenderer
-PyQgsOGRProvider
 PyQgsSpatialiteProvider
 PyQgsSymbolLayerReadSld
 PyQgsVectorLayerCache
@@ -81,4 +78,5 @@ ProcessingQgisAlgorithmsTestPt3
 ProcessingQgisAlgorithmsTestPt4
 ProcessingGdalAlgorithmsVectorTest
 ProcessingGrassAlgorithmsImageryTest
+# PyQgsProviderRegistry runs fine locally on Fedora:rawhide but not on CI
 PyQgsProviderRegistry

.docker/docker-qgis-build.sh

@@ -35,16 +35,11 @@ pushd ${CTEST_BUILD_DIR} > /dev/null
 echo "${bold}Running cmake...${endbold}"
 echo "::group::cmake"
 
-if [[ -f "/usr/lib64/ccache/clang" ]]; then
-  export CC=/usr/lib64/ccache/clang
-  export CXX=/usr/lib64/ccache/clang++
-else
-  export CC=/usr/lib/ccache/clang
-  export CXX=/usr/lib/ccache/clang++
-fi
-
 BUILD_TYPE=Release
 
+export CC=/usr/bin/clang
+export CXX=/usr/bin/clang++
+
 if [[ "${WITH_CLAZY}" = "ON" ]]; then
   # In release mode, all variables in QgsDebugMsg would be considered unused
   BUILD_TYPE=Debug
@@ -75,7 +70,7 @@ fi
 cmake \
  -GNinja \
  -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
- -DUSE_CCACHE=OFF \
+ -DUSE_CCACHE=ON \
  -DBUILD_WITH_QT6=${BUILD_WITH_QT6} \
  -DWITH_DESKTOP=ON \
  -DWITH_ANALYSIS=ON \

.github/workflows/code_layout.yml

@@ -154,17 +154,24 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: Install Requirements
         run: |
           sudo apt install -y \
               expect \
               silversearcher-ag
-      - uses: tj-actions/changed-files@v42
+
+      - name: Retrieve changed files
+        uses: tj-actions/changed-files@v44
         id: changed_files
         with:
-          separator: ' '
+          separator: " "
+
       - name: Spell Test
-        run: ./scripts/spell_check/check_spelling.sh -r "${{ steps.changed_files.outputs.all_changed_files }}"
+        if: steps.changed_files.outputs.any_changed == 'true'
+        env:
+          ALL_CHANGED_FILES: ${{ steps.changed_files.outputs.all_changed_files }}
+        run: echo "$ALL_CHANGED_FILES" | ./scripts/spell_check/check_spelling.sh
 
   sip_check:
     runs-on: ubuntu-latest

.github/workflows/macos-build.yml

@@ -38,36 +38,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Prepare build cache for pull request
-        uses: pat-s/[email protected]
-        if: github.event_name == 'pull_request'
+      - name: Restore build cache
+        uses: actions/cache/restore@v4
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: build-mac-ccache-${{ github.actor }}-${{ github.head_ref }}-${{ github.sha }}
-          # The head_ref or source branch of the pull request in a workflow run.
-          # The base_ref or target branch of the pull request in a workflow run.
+          key: build-ccache-mac-${{ github.event.pull_request.base.ref || github.ref_name }}
           restore-keys: |
-            build-mac-ccache-${{ github.actor }}-${{ github.head_ref }}-
-            build-mac-ccache-refs/heads/${{ github.base_ref }}-
-            build-mac-ccache-refs/heads/master-
-
-      - name: Prepare build cache for branch/tag
-        # use a fork of actions/cache@v2 to upload cache even when the build or test failed
-        uses: pat-s/[email protected]
-        if: github.event_name != 'pull_request'
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          # The branch or tag ref that triggered the workflow run. For branches this in the format refs/heads/<branch_name>, and for tags it is refs/tags/<tag_name>
-          key: build-mac-ccache-${{ github.ref }}-${{ github.sha }}
-          restore-keys: |
-            build-mac-ccache-${{ github.ref }}-
-            build-mac-ccache-refs/heads/master-
+            build-ccache-mac-master
 
-
-      # Qt caching
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4
         with:
           path: ${{ env.DEPS_CACHE_DIR }}/Qt/${{ env.QT_VERSION }}
           key: mac-qt-${{ env.QT_VERSION }}
@@ -90,7 +71,7 @@ jobs:
       # QGIS-deps caching
       - name: Cache qgis-deps
         id: cache-deps
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4
         with:
           path: ${{ env.DEPS_CACHE_DIR }}/QGIS/qgis-deps-${{ env.QGIS_DEPS_VERSION }}.${{ env.QGIS_DEPS_PATCH_VERSION }}
           key: mac-qgis-deps-${{ env.QGIS_DEPS_VERSION }}.${{ env.QGIS_DEPS_PATCH_VERSION }}
@@ -109,8 +90,6 @@ jobs:
           mkdir -p ${DEPS_CACHE_DIR}
           mkdir -p ${DEPS_CACHE_DIR}/QGIS
 
-
-
       - name: Install Qt and deps
         env:
           QT_ALREADY_CACHED: ${{ steps.cache-qt.outputs.cache-hit }}
@@ -150,3 +129,10 @@ jobs:
         run: |
           cd ${BUILD_DIR}
           make -j $(sysctl -n hw.ncpu)
+
+      - name: Save build cache for push only
+        uses: actions/cache/save@v4
+        if: ${{ github.event_name == 'push' }}
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: build-ccache-mac-${{ github.ref_name }}-${{ github.run_id }}