Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: Update latest build to build git & remove GML #2650

Merged
merged 2 commits into from
Nov 14, 2022
Merged

CI: Update latest build to build git & remove GML #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
040ceb3
CI: Update latest build to build git & remove GML
snowman2 Nov 12, 2022
71b9db9
TST: Update mock_debian for GDAL 3.1-3.7
snowman2 Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/test_gdal_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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: |
Expand Down
1 change: 0 additions & 1 deletion ci/gdal-compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ cmake .. \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=Release \
-DOGR_BUILD_OPTIONAL_DRIVERS=OFF \
-DOGR_ENABLE_DRIVER_GML=ON \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OSGeo/gdal#6647

-DBUILD_CSHARP_BINDINGS=OFF \
-DBUILD_PYTHON_BINDINGS=OFF \
-DBUILD_JAVA_BINDINGS=OFF
Expand Down
4 changes: 1 addition & 3 deletions tests/test__env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down