Skip to content

Commit 3c42579

Browse files
committed
Update to latest master changes.
1 parent 65974c7 commit 3c42579

File tree

564 files changed

+21298
-4686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

564 files changed

+21298
-4686
lines changed

.github/workflows/armhf/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44

55
source ${GDAL_SOURCE_DIR:=..}/scripts/setdevenv.sh
66

7-
autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSpawn
7+
autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSpawn:test_cpl.CPLGetCurrentThreadCount
88

99
pytest autotest/alg -k "not test_warp_52 and not test_warp_rpc_source_has_geotransform"
1010
# Excluded tests starting at test_tiff_read_multi_threaded are due to lack of virtual memory

.github/workflows/cmake_builds.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ jobs:
6161
python3-pytest swig doxygen texlive-latex-base make cppcheck ccache g++ \
6262
libpq-dev libpqtypes-dev postgresql-14 postgresql-14-postgis-3 postgresql-client-14 postgresql-14-postgis-3-scripts
6363
# MSSQL: client side
64-
curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
65-
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
66-
sudo apt-get update
67-
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev
64+
# Disabled because of Conflicting values set for option Signed-By regarding source https://packages.microsoft.com/ubuntu/22.04/prod/ jammy: /usr/share/keyrings/microsoft-prod.gpg !=
65+
# curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
66+
# curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
67+
# sudo apt-get update
68+
# sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev
6869
# HANA: client side
6970
# Install hdbsql tool
7071
curl -v -j -k -s -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 \
@@ -93,7 +94,7 @@ jobs:
9394
wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
9495
sudo apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
9596
sudo apt-get update
96-
sudo apt-get install -y -V libarrow-dev libparquet-dev libarrow-dataset-dev
97+
sudo apt-get install -y -V libarrow-dev libparquet-dev libarrow-dataset-dev libarrow-compute-dev
9798
#
9899
PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -r $GITHUB_WORKSPACE/autotest/requirements.txt
99100
@@ -329,7 +330,7 @@ jobs:
329330
mingw-w64-x86_64-geos mingw-w64-x86_64-libspatialite mingw-w64-x86_64-proj
330331
mingw-w64-x86_64-cgal mingw-w64-x86_64-libfreexl mingw-w64-x86_64-hdf5 mingw-w64-x86_64-muparser mingw-w64-x86_64-netcdf mingw-w64-x86_64-poppler mingw-w64-x86_64-podofo mingw-w64-x86_64-postgresql
331332
mingw-w64-x86_64-libgeotiff mingw-w64-x86_64-libpng mingw-w64-x86_64-libtiff mingw-w64-x86_64-openjpeg2
332-
mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-pytest mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-python-lxml mingw-w64-x86_64-swig mingw-w64-x86_64-python-psutil mingw-w64-x86_64-blosc mingw-w64-x86_64-libavif
333+
mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-pytest mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-swig mingw-w64-x86_64-python-psutil mingw-w64-x86_64-blosc mingw-w64-x86_64-libavif
333334
- name: Setup cache
334335
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
335336
id: cache
@@ -353,7 +354,7 @@ jobs:
353354
run: |
354355
# One of the dependencies of jsonschema 4.18 is rpds_py which requires a Rust compiler
355356
PYTHON_CMD=python3 && $PYTHON_CMD -m pip install "jsonschema<4.18"
356-
PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -r autotest/requirements.txt
357+
PYTHON_CMD=python3 && $PYTHON_CMD -m pip install pytest-sugar pytest-env pytest-benchmark filelock
357358
# Disable mySQL since C:/mysql/lib/mysqlclient.lib (unrelated to msys) is found, which causes linking issues
358359
# Set explicitly CMAKE_C|CXX_COMPILER otherwise C:/ProgramData/chocolatey/bin/gcc.exe would be used
359360
# Disable GDAL_ENABLE_DRIVER_HDF5 because of https://github.com/OSGeo/gdal/issues/11181

.github/workflows/code_checks.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,17 @@ jobs:
235235
git diff
236236
git diff --quiet || (echo "You need to run scripts/collect_config_options to update port/cpl_known_config_options.h" && /bin/false)
237237
238+
check-driver-connection-prefix:
239+
runs-on: ubuntu-latest
240+
steps:
241+
- name: Checkout
242+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
243+
- name: Set up Python
244+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
245+
with:
246+
python-version: 3.8
247+
- name: Check cmakelist
248+
run: |
249+
python scripts/collect_driver_connection_prefix.py
250+
git diff
251+
git diff --quiet || (echo "You need to run scripts/collect_driver_connection_prefix.py to update gcore/gdal_known_connection_prefixes.h" && /bin/false)

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
# We do that after running CMake to avoid CodeQL to trigger during CMake time,
109109
# in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
110110
- name: Initialize CodeQL
111-
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
111+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
112112
with:
113113
languages: ${{ matrix.language }}
114114
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -128,6 +128,6 @@ jobs:
128128
cmake --build build -j$(nproc)
129129
130130
- name: Perform CodeQL Analysis
131-
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
131+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
132132
with:
133133
category: "/language:${{matrix.language}}"

.github/workflows/coverage/test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ IP=host.docker.internal
2222
(cd autotest && OGR_PG_CONNECTION_STRING="host=$IP port=25432 dbname=autotest user=docker password=docker" $PYTEST --capture=no -ra ogr/ogr_pg.py)
2323
(cd autotest && PGHOST="$IP" PGPORT=25432 PGUSER=docker PGPASSWORD=docker $PYTEST --capture=no -ra gdrivers/postgisraster.py)
2424

25+
(cd autotest && $PYTEST --capture=no -ra utilities/test_gdalalg_raster_tile.py::test_gdalalg_raster_tile_fork_auto)
26+
2527
# Generate coverage report
2628
lcov --directory . --capture --output-file gdal.info 2>/dev/null
2729
cp gdal.info gdal_filtered.info

.github/workflows/delete_untagged_containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: github.repository == 'OSGeo/gdal'
2020
steps:
2121
- name: Delete all containers from gdal-deps without tags
22-
uses: Chizkiyahu/delete-untagged-ghcr-action@4a33ce3cf2456d2aef98a1b6c60a12dad56cffd9 # v6.0.0
22+
uses: Chizkiyahu/delete-untagged-ghcr-action@68758dd8caf1d9dbaed1fe9cc1a1f8fcea1c4cf0 # v6.1.0
2323
with:
2424
token: ${{ secrets.PAT_TOKEN_DELETE_UNTAGGED_CONTAINERS }}
2525
repository_owner: ${{ github.repository_owner }}

.github/workflows/fedora_rawhide/Dockerfile.ci

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
FROM fedora:rawhide@sha256:19fcecbd14f2c1e887cbeb974295f5fc0e7b81e2df133e4f1b47a6f65cd11737
1+
FROM fedora:rawhide@sha256:af660adb8de42682b494c7d102860c155466ba61cd850a8420e1ffad1764b1b7
22

3-
# FIXME: Exclude update of dnf&rpm themselves as this results in a no longer working dnf
4-
# cf https://github.com/OSGeo/gdal/actions/runs/9448190401/job/26021669415?pr=10173
5-
# Likely a transient issue with Fedora 41 dev cycle
6-
RUN dnf upgrade -y -x dnf -x rpm
3+
RUN dnf upgrade -y
74
RUN dnf install -y --setopt=install_weak_deps=False proj-devel
85
RUN dnf install -y clang make diffutils ccache cmake \
96
libxml2-devel libxslt-devel expat-devel xerces-c-devel \

.github/workflows/s390x/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44

55
source ${GDAL_SOURCE_DIR:=..}/scripts/setdevenv.sh
66

7-
autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSM_signed:test_cpl.CPLSpawn:test_cpl.CPLUTF8ForceToASCII
7+
autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSM_signed:test_cpl.CPLSpawn:test_cpl.CPLUTF8ForceToASCII:test_cpl.CPLGetCurrentThreadCount
88

99
pytest autotest/alg
1010
pytest autotest/gcore -k "not transformer and not virtualmem and not test_vrt_protocol_netcdf_component_name and not test_vsicrypt_3"

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
74+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
7575
with:
7676
sarif_file: results.sarif

.github/workflows/ubuntu_24.04/Dockerfile.ci

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RUN apt-get update \
9999
&& ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev
100100

101101
# Build mongo-c-driver
102-
ARG MONGO_C_DRIVER_VERSION=1.24.4
102+
ARG MONGO_C_DRIVER_VERSION=2.0.2
103103
RUN mkdir mongo-c-driver \
104104
&& wget -q https://github.com/mongodb/mongo-c-driver/releases/download/${MONGO_C_DRIVER_VERSION}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}.tar.gz -O - \
105105
| tar xz -C mongo-c-driver --strip-components=1 \
@@ -113,7 +113,7 @@ RUN mkdir mongo-c-driver \
113113
&& rm -rf mongo-c-driver
114114

115115
# Build mongocxx
116-
ARG MONGOCXX_VERSION=3.8.1
116+
ARG MONGOCXX_VERSION=4.1.1
117117
RUN mkdir mongocxx \
118118
&& wget -q https://github.com/mongodb/mongo-cxx-driver/archive/r${MONGOCXX_VERSION}.tar.gz -O - \
119119
| tar xz -C mongocxx --strip-components=1 \

0 commit comments

Comments
 (0)