Merge pull request #2650 from snowman2/maint-1.3

CI: Update latest build to build git & remove GML
rasterio · Nov 14, 2022 · c47bea8 · c47bea8
2 parents b9ce44b + 71b9db9
commit c47bea8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/test_gdal_latest.yaml b/.github/workflows/test_gdal_latest.yaml
@@ -2,7 +2,7 @@ name: Test GDAL Latest
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 'maint-*' ]
   schedule:
     - cron:  '0 0 * * 0'
   pull_request:  # also build on PRs touching this file
@@ -49,7 +49,11 @@ jobs:
             libcurl4-gnutls-dev \
             libgeos-dev \
             libjpeg-dev \
+            libnetcdf-dev \
+            libhdf4-alt-dev \
+            libhdf5-serial-dev \
             libssl-dev \
+            libsqlite3-dev \
             libexpat-dev \
             libxerces-c-dev \
             libpng-dev \
@@ -59,7 +63,7 @@ jobs:
             cmake \
             curl \
             git
-          bash ci/gdal-compile.sh 3.6.0rc2
+          bash ci/gdal-compile.sh git
 
       - name: Install dependencies
         run: |

diff --git a/ci/gdal-compile.sh b/ci/gdal-compile.sh
@@ -22,7 +22,6 @@ cmake .. \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_BUILD_TYPE=Release \
     -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \
-    -DOGR_ENABLE_DRIVER_GML=ON \
     -DBUILD_CSHARP_BINDINGS=OFF \
     -DBUILD_PYTHON_BINDINGS=OFF \
     -DBUILD_JAVA_BINDINGS=OFF

diff --git a/tests/test__env.py b/tests/test__env.py
@@ -35,15 +35,13 @@ def mock_fhs(tmpdir):
 @pytest.fixture
 def mock_debian(tmpdir):
     """A fake Debian multi-install system"""
-    tmpdir.ensure("share/gdal/2.3/header.dxf")
-    tmpdir.ensure("share/gdal/2.4/header.dxf")
-    tmpdir.ensure("share/gdal/3.0/header.dxf")
     tmpdir.ensure("share/gdal/3.1/header.dxf")
     tmpdir.ensure("share/gdal/3.2/header.dxf")
     tmpdir.ensure("share/gdal/3.3/header.dxf")
     tmpdir.ensure("share/gdal/3.4/header.dxf")
     tmpdir.ensure("share/gdal/3.5/header.dxf")
     tmpdir.ensure("share/gdal/3.6/header.dxf")
+    tmpdir.ensure(f"share/gdal/{gdal_version.major}.{gdal_version.minor}/header.dxf")
     tmpdir.ensure("share/proj/epsg")
     return tmpdir