forked from OSGeo/gdal
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'OSGeo:master' into master
- Loading branch information
Showing
1,210 changed files
with
13,087 additions
and
22,108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -319,7 +319,7 @@ jobs: | |
| - name: Checkout GDAL | ||
| uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 | ||
| - name: Install development packages | ||
| uses: msys2/setup-msys2@ddf331adaebd714795f1042345e6ca57bd66cea8 # v2.24.1 | ||
| uses: msys2/setup-msys2@c52d1fa9c7492275e60fe763540fb601f5f232a1 # v2.25.0 | ||
| with: | ||
| msystem: MINGW64 | ||
| update: true | ||
|
|
@@ -418,7 +418,7 @@ jobs: | |
| shell: pwsh | ||
| run: | | ||
| echo "JAVA_HOME=$env:JAVA_HOME_11_X64" >> %GITHUB_ENV% | ||
| - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 | ||
| - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0 | ||
| with: | ||
| activate-environment: gdalenv | ||
| miniforge-version: latest | ||
|
|
@@ -525,7 +525,7 @@ jobs: | |
| git config --global core.autocrlf false | ||
| - name: Checkout GDAL | ||
| uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 | ||
| - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 | ||
| - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0 | ||
| with: | ||
| activate-environment: gdalenv | ||
| miniforge-version: latest | ||
|
|
@@ -625,26 +625,9 @@ jobs: | |
| rm -rf /opt/homebrew/lib/node_modules # conflicts with node@18 from brew | ||
| brew update | ||
| brew outdated | ||
| # Attempt at fixing: | ||
| # => Pouring pkgconf--2.3.0_1.arm64_sonoma.bottle.tar.gz | ||
| # Error: The `brew link` step did not complete successfully | ||
| # The formula built, but is not symlinked into /opt/homebrew | ||
| # Could not symlink bin/pkg-config | ||
| # Target /opt/homebrew/bin/pkg-config | ||
| # is a symlink belonging to [email protected]. You can unlink it: | ||
| # brew unlink [email protected] | ||
| # | ||
| # To force the link and overwrite all conflicting files: | ||
| # brew link --overwrite pkgconf | ||
| # | ||
| # To list all files that would be deleted: | ||
| # brew link --overwrite pkgconf --dry-run | ||
| # | ||
| # Possible conflicting files are: | ||
| # /opt/homebrew/bin/pkg-config -> /opt/homebrew/Cellar/[email protected]/0.29.2_3/bin/pkg-config | ||
| # /opt/homebrew/share/aclocal/pkg.m4 -> /opt/homebrew/Cellar/[email protected]/0.29.2_3/share/aclocal/pkg.m4 | ||
| # /opt/homebrew/share/man/man1/pkg-config.1 -> /opt/homebrew/Cellar/[email protected]/0.29.2_3/share/man/man1/pkg-config.1 | ||
| rm -f /opt/homebrew/bin/pkg-config /opt/homebrew/share/aclocal/pkg.m4 /opt/homebrew/share/man/man1/pkg-config.1 | ||
| mv /opt/homebrew/bin/pkg-config /opt/homebrew/bin/pkg-config.old | ||
| mv /opt/homebrew/share/aclocal/pkg.m4 /opt/homebrew/share/aclocal/pkg.m4.old | ||
| mv /opt/homebrew/share/man/man1/pkg-config.1 /opt/homebrew/share/man/man1/pkg-config.1.old | ||
| brew install --overwrite [email protected] [email protected] | ||
| brew install postgresql || brew link postgresql | ||
| brew install pkg-config freexl libxml2 libspatialite geos proj libgeotiff openjpeg giflib libaec postgis poppler doxygen unixodbc jpeg-turbo aom jpeg-xl libheif libarchive libkml boost | ||
|
|
@@ -654,6 +637,9 @@ jobs: | |
| brew uninstall --ignore-dependencies gdal | ||
| # Workaround for https://github.com/Homebrew/homebrew-core/pull/170959#issuecomment-2379606442 | ||
| sed -i .bak 's/hdf5_hl;hdf5;/hdf5_hl-shared;hdf5-shared;/g' "$(brew --prefix netcdf)/lib/cmake/netCDF/netCDFTargets.cmake" | ||
| mv /opt/homebrew/bin/pkg-config.old /opt/homebrew/bin/pkg-config | ||
| mv /opt/homebrew/share/aclocal/pkg.m4.old /opt/homebrew/share/aclocal/pkg.m4 | ||
| mv /opt/homebrew/share/man/man1/pkg-config.1.old /opt/homebrew/share/man/man1/pkg-config.1 | ||
| - name: Configure ccache | ||
| run: | | ||
| echo CCACHE_BASEDIR=$PWD >> ${GITHUB_ENV} | ||
|
|
@@ -710,7 +696,7 @@ jobs: | |
| git config --global core.autocrlf false | ||
| - name: Checkout GDAL | ||
| uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 | ||
| - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 | ||
| - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0 | ||
| with: | ||
| activate-environment: gdalenv | ||
| python-version: 3.9 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| FROM ubuntu:24.04 | ||
|
|
||
| ENV DEBIAN_FRONTEND=noninteractive | ||
| ENV TARGET_ARCH=s390x | ||
| ENV GCC_ARCH=s390x | ||
| ENV APT_ARCH_SUFFIX=:s390x | ||
|
|
||
| RUN rm -f /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \ | ||
| && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble main restricted universe" >> /etc/apt/sources.list \ | ||
| && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-updates main restricted universe" >> /etc/apt/sources.list \ | ||
| && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-backports main restricted universe" >> /etc/apt/sources.list \ | ||
| && echo "deb [arch=amd64] http://security.ubuntu.com/ubuntu noble-security main restricted universe" >> /etc/apt/sources.list \ | ||
| && echo "deb [arch=${TARGET_ARCH}] http://ports.ubuntu.com/ubuntu-ports/ noble main restricted universe" >> /etc/apt/sources.list \ | ||
| && echo "deb [arch=${TARGET_ARCH}] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted universe" >> /etc/apt/sources.list \ | ||
| && echo "deb [arch=${TARGET_ARCH}] http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted universe" >> /etc/apt/sources.list \ | ||
| && dpkg --add-architecture ${TARGET_ARCH} \ | ||
| && apt-get update -y \ | ||
| && DEBIAN_FRONTEND=noninteractive apt-get install -y g++-13-${GCC_ARCH}-linux-gnu \ | ||
| && ln -s ${GCC_ARCH}-linux-gnu-gcc-13 /usr/bin/${GCC_ARCH}-linux-gnu-gcc \ | ||
| && ln -s ${GCC_ARCH}-linux-gnu-g++-13 /usr/bin/${GCC_ARCH}-linux-gnu-g++ | ||
|
|
||
| ENV CC=${GCC_ARCH}-linux-gnu-gcc-13 | ||
| ENV CXX=${GCC_ARCH}-linux-gnu-g++-13 | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y --allow-unauthenticated \ | ||
| bash \ | ||
| ccache \ | ||
| cmake \ | ||
| curl \ | ||
| ninja-build \ | ||
| libavif-dev${APT_ARCH_SUFFIX} \ | ||
| libblosc-dev${APT_ARCH_SUFFIX} \ | ||
| libboost-dev${APT_ARCH_SUFFIX} \ | ||
| libcairo2-dev${APT_ARCH_SUFFIX} \ | ||
| libcfitsio-dev${APT_ARCH_SUFFIX} \ | ||
| libcrypto++-dev${APT_ARCH_SUFFIX} \ | ||
| libcurl4-gnutls-dev${APT_ARCH_SUFFIX} \ | ||
| libexpat-dev${APT_ARCH_SUFFIX} \ | ||
| libfcgi-dev${APT_ARCH_SUFFIX} \ | ||
| libfyba-dev${APT_ARCH_SUFFIX} \ | ||
| libfreexl-dev${APT_ARCH_SUFFIX} \ | ||
| libgeos-dev${APT_ARCH_SUFFIX} \ | ||
| libgeotiff-dev${APT_ARCH_SUFFIX} \ | ||
| libgif-dev${APT_ARCH_SUFFIX} \ | ||
| libhdf4-alt-dev${APT_ARCH_SUFFIX} \ | ||
| libhdf5-serial-dev${APT_ARCH_SUFFIX} \ | ||
| libheif-dev${APT_ARCH_SUFFIX} \ | ||
| libjpeg-dev${APT_ARCH_SUFFIX} \ | ||
| libjxl-dev${APT_ARCH_SUFFIX} \ | ||
| libkml-dev${APT_ARCH_SUFFIX} \ | ||
| liblz4-dev${APT_ARCH_SUFFIX} \ | ||
| liblzma-dev${APT_ARCH_SUFFIX} \ | ||
| libmysqlclient-dev${APT_ARCH_SUFFIX} \ | ||
| libnetcdf-dev${APT_ARCH_SUFFIX} \ | ||
| libogdi-dev${APT_ARCH_SUFFIX} \ | ||
| libopenexr-dev${APT_ARCH_SUFFIX} \ | ||
| libopenjp2-7-dev${APT_ARCH_SUFFIX} \ | ||
| libpcre3-dev${APT_ARCH_SUFFIX} \ | ||
| libpng-dev${APT_ARCH_SUFFIX} \ | ||
| libpoppler-dev${APT_ARCH_SUFFIX} \ | ||
| libpoppler-private-dev${APT_ARCH_SUFFIX} \ | ||
| libpq-dev${APT_ARCH_SUFFIX} \ | ||
| libproj-dev${APT_ARCH_SUFFIX} \ | ||
| librasterlite2-dev${APT_ARCH_SUFFIX} \ | ||
| libspatialite-dev${APT_ARCH_SUFFIX} \ | ||
| libssl-dev${APT_ARCH_SUFFIX} \ | ||
| libwebp-dev${APT_ARCH_SUFFIX} \ | ||
| libxerces-c-dev${APT_ARCH_SUFFIX} \ | ||
| libxml2-dev${APT_ARCH_SUFFIX} \ | ||
| libxslt-dev${APT_ARCH_SUFFIX} \ | ||
| libzstd-dev${APT_ARCH_SUFFIX} \ | ||
| python3-dev${APT_ARCH_SUFFIX} \ | ||
| python3-numpy${APT_ARCH_SUFFIX} \ | ||
| python3-setuptools${APT_ARCH_SUFFIX} \ | ||
| python3-pip \ | ||
| swig \ | ||
| unixodbc-dev${APT_ARCH_SUFFIX} \ | ||
| wget \ | ||
| zip | ||
|
|
||
| COPY requirements.txt /tmp/ | ||
| RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -eu | ||
|
|
||
| CMAKE_ARGS=( | ||
| "-GNinja" \ | ||
| "-DUSE_CCACHE=ON" \ | ||
| "-DCMAKE_BUILD_TYPE=RelWithDebInfo" \ | ||
| "-DCMAKE_INSTALL_PREFIX=/usr" \ | ||
| "-DGDAL_USE_TIFF_INTERNAL=ON" \ | ||
| "-DGDAL_USE_GEOTIFF_INTERNAL=ON" \ | ||
| "-DBUILD_CSHARP_BINDINGS=OFF" \ | ||
| "-DBUILD_JAVA_BINDINGS=OFF" | ||
| ) | ||
|
|
||
| cmake ${GDAL_SOURCE_DIR:=..} \ | ||
| "${CMAKE_ARGS[@]}" | ||
|
|
||
| ninja | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -eu | ||
|
|
||
| source ${GDAL_SOURCE_DIR:=..}/scripts/setdevenv.sh | ||
|
|
||
| autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSM_signed:test_cpl.CPLSpawn:test_cpl.CPLUTF8ForceToASCII | ||
|
|
||
| pytest autotest/alg | ||
| pytest autotest/gcore -k "not transformer and not virtualmem and not test_vrt_protocol_netcdf_component_name and not test_vsicrypt_3" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.