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.

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

Rebuild for libgdal310 #302

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 2 additions & 17 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -19,7 +19,7 @@ docker_image:
fftw:
- '3'
gdal:
- '3.9'
- '3.10'
geos:
- 3.13.0
glib:
Expand All @@ -38,8 +38,5 @@ pcre:
- '8'
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1'
7 changes: 2 additions & 5 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -23,7 +23,7 @@ docker_image:
fftw:
- '3'
gdal:
- '3.9'
- '3.10'
geos:
- 3.13.0
glib:
Expand All @@ -42,8 +42,5 @@ pcre:
- '8'
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1'
7 changes: 2 additions & 5 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -19,7 +19,7 @@ docker_image:
fftw:
- '3'
gdal:
- '3.9'
- '3.10'
geos:
- 3.13.0
glib:
Expand All @@ -38,8 +38,5 @@ pcre:
- '8'
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1'
8 changes: 0 additions & 8 deletions .ci_support/migrations/geos3130.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions .ci_support/migrations/libgdal310.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
gdal:
- '3.10'
libgdal:
- '3.10'
libgdal_core:
- '3.10'
migrator_ts: 1731733901.4913723
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
fftw:
- '3'
gdal:
- '3.9'
- '3.10'
geos:
- 3.13.0
glib:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
fftw:
- '3'
gdal:
- '3.9'
- '3.10'
geos:
- 3.13.0
glib:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ curl:
fftw:
- '3'
gdal:
- '3.9'
- '3.10'
geos:
- 3.13.0
glib:
Expand Down
14 changes: 7 additions & 7 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 28 additions & 17 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 30 additions & 10 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 29 additions & 4 deletions azure-pipelines.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading