Merge remote-tracking branch 'upstream/master'

Author: abellgithub

.github/workflows/asan/test.sh

@@ -11,6 +11,7 @@ export SKIP_VIRTUALMEM=YES
 export LD_PRELOAD=$(clang -print-file-name=libclang_rt.asan-x86_64.so)
 export ASAN_OPTIONS=allocator_may_return_null=1:symbolize=1:suppressions=$PWD/../autotest/asan_suppressions.txt
 export LSAN_OPTIONS=detect_leaks=1,print_suppressions=0,suppressions=$PWD/../autotest/lsan_suppressions.txt
+export UBSAN_OPTIONS=print_stacktrace=1,suppressions=$PWD/../autotest/ubsan_suppressions.txt
 export PYTHONMALLOC=malloc
 
 gdalinfo autotest/gcore/data/byte.tif
@@ -63,6 +64,12 @@ if grep -P '===.*\d+ failed' ./test-output.txt > /dev/null ; then
 elif grep '==ABORTING' ./test-output.txt; then
     echo 'Tests crashed'
     exit 1
+elif grep 'UndefinedBehaviorSanitizer' ./test-output.txt; then
+    echo 'UndefinedBehavior detected'
+    exit 1
+elif grep 'ERROR: LeakSanitizer' ./test-output.txt; then
+    echo 'Memory leak detected'
+    exit 1
 else
     echo 'Tests passed'
 fi

.github/workflows/cmake_builds.yml

@@ -318,7 +318,7 @@ jobs:
       - name: Checkout GDAL
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Install development packages
-        uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # v2.27.0
+        uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2.28.0
         with:
           msystem: MINGW64
           update: true
@@ -417,7 +417,7 @@ jobs:
       shell: pwsh
       run: |
         echo "JAVA_HOME=$env:JAVA_HOME_11_X64" >> %GITHUB_ENV%
-    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
+    - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
       with:
         activate-environment: gdalenv
         miniforge-version: latest
@@ -523,7 +523,7 @@ jobs:
         git config --global core.autocrlf false
     - name: Checkout GDAL
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
+    - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
       with:
         activate-environment: gdalenv
         miniforge-version: latest
@@ -555,7 +555,7 @@ jobs:
       shell: bash -l {0}
       run: |
         rm -f build/CMakeCache.txt
-        cmake -A ${architecture} -G "${generator}" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -Werror=dev "-DCMAKE_CXX_COMPILER_LAUNCHER=clcache" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DGDAL_USE_EXTERNAL_LIBS:BOOL=OFF -DGDAL_USE_PNG_INTERNAL=OFF -DGDAL_USE_JPEG_INTERNAL=OFF -DGDAL_USE_JPEG12_INTERNAL=OFF -DGDAL_USE_GIF_INTERNAL=OFF -DGDAL_USE_LERC_INTERNAL=OFF -DGDAL_USE_LERCV1_INTERNAL=OFF -DGDAL_USE_QHULL_INTERNAL=OFF -DGDAL_USE_OPENCAD_INTERNAL=OFF -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF -DOGR_BUILD_OPTIONAL_DRIVERS=OFF -DGDAL_ENABLE_DRIVER_DERIVED=ON -DWERROR_DEV_FLAG="-Werror=dev"
+        cmake -A ${architecture} -G "${generator}" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -Werror=dev "-DCMAKE_CXX_COMPILER_LAUNCHER=clcache" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DGDAL_USE_EXTERNAL_LIBS:BOOL=OFF -DGDAL_USE_PNG_INTERNAL=OFF -DGDAL_USE_JPEG_INTERNAL=OFF -DGDAL_USE_JPEG12_INTERNAL=OFF -DGDAL_USE_GIF_INTERNAL=OFF -DGDAL_USE_LERC_INTERNAL=OFF -DGDAL_USE_LERCV1_INTERNAL=OFF -DGDAL_USE_QHULL_INTERNAL=OFF -DGDAL_USE_OPENCAD_INTERNAL=OFF -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF -DOGR_BUILD_OPTIONAL_DRIVERS=OFF -DGDAL_ENABLE_DRIVER_DERIVED=ON -DGDAL_VRT_ENABLE_RAWRASTERBAND=OFF -DWERROR_DEV_FLAG="-Werror=dev"
     - name: Build
       shell: bash -l {0}
       run: cmake --build $GITHUB_WORKSPACE/build --config RelWithDebInfo -j 2
@@ -694,7 +694,7 @@ jobs:
         git config --global core.autocrlf false
     - name: Checkout GDAL
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
+    - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
       with:
         activate-environment: gdalenv
         python-version: 3.9

.github/workflows/codeql.yml

@@ -108,7 +108,7 @@ jobs:
     # We do that after running CMake to avoid CodeQL to trigger during CMake time,
     # in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -128,6 +128,6 @@ jobs:
         cmake --build build -j$(nproc)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/conda.yml

@@ -50,7 +50,7 @@ jobs:
         path: ~/conda_pkgs_dir
         key: ${{ runner.os }}-${{ steps.get-date.outputs.today }}-conda-${{ env.CACHE_NUMBER }}
 
-    - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
+    - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
       with:
         miniforge-version: latest
         use-mamba: true

.github/workflows/doc_checks.yml

@@ -35,6 +35,7 @@ jobs:
           python3 -m venv create doc_env
           . doc_env/bin/activate
           python3 -m pip install -r doc/requirements.txt
+          python3 -m pip install setuptools
           echo PATH=$PATH >> $GITHUB_ENV
 
     - name: Build GDAL

.github/workflows/fedora_rawhide/Dockerfile.ci

@@ -23,12 +23,9 @@ RUN dnf install -y clang make diffutils ccache cmake \
       libpq-devel \
       libavif-devel \
       python3-setuptools python3-pip python3-devel python3-lxml swig \
-      glibc-gconv-extra
+      glibc-gconv-extra \
+      python3-jsonschema python3-pytest python3-pytest-env python3-pytest-sugar \
+      python3-pytest-benchmark python3-filelock
 
 COPY requirements.txt /tmp/
-# One of the dependencies of jsonschema 4.18 is rpds_py which requires a Rust compiler
-RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install "jsonschema<4.18"
 RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -r /tmp/requirements.txt
-
-# Workaround https://bugzilla.redhat.com/show_bug.cgi?id=2332307
-RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install --force-reinstall numpy

.github/workflows/fedora_rawhide/build.sh

@@ -2,17 +2,20 @@
 
 set -e
 
+# Disable Curl because network based tests fail since b259dc5f54cf6a1f6ba5fb5bb4484c051d1e7142
 cmake ${GDAL_SOURCE_DIR:=..} \
-  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
   -DCMAKE_C_COMPILER=clang \
   -DCMAKE_CXX_COMPILER=clang++ \
-  -DCMAKE_C_FLAGS="-Werror -O1 -D_FORTIFY_SOURCE=2" \
-  -DCMAKE_CXX_FLAGS="-std=c++20 -Werror -O1 -D_FORTIFY_SOURCE=2" \
+  -DCMAKE_CXX_STANDARD=23 \
+  -DCMAKE_C_FLAGS="-Werror -O2 -D_FORTIFY_SOURCE=2" \
+  -DCMAKE_CXX_FLAGS="-Werror -O2 -D_FORTIFY_SOURCE=2" \
   -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \
   -DUSE_CCACHE=ON \
   "-DUSE_PRECOMPILED_HEADERS=ON" \
   -DEMBED_RESOURCE_FILES=ON \
   -DCMAKE_INSTALL_PREFIX=/usr \
+  -DGDAL_USE_CURL=OFF \
   -DWERROR_DEV_FLAG="-Werror=dev"
 make -j$(nproc)
 make -j$(nproc) install DESTDIR=/tmp/install-gdal

.github/workflows/fedora_rawhide/test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+# Do not run in parallel to avoid issues with local webserver
+ctest -V

.github/workflows/linux_build.yml

@@ -80,6 +80,7 @@ jobs:
             travis_branch: fedora_rawhide
             container: fedora_rawhide
             build_script: build.sh
+            test_script: test.sh
             os: ubuntu-22.04
 
           - name: Ubuntu 24.04, gcc
@@ -143,6 +144,7 @@ jobs:
           - name: Ubuntu 24.04, s390x
             id: s390x
             container: s390x
+            travis_branch: s390x
             build_script: build.sh
             test_script: test.sh
             os: ubuntu-22.04

.github/workflows/macos.yml

@@ -29,7 +29,7 @@ jobs:
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
+      - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
         with:
             channels: conda-forge
             auto-update-conda: true