Skip to content

Commit

Permalink
Merge pull request #119 from h-vetinari/17.x
Browse files Browse the repository at this point in the history
[17.x] revert a patch that (likely) causes `_availability_version_check` to not be found
  • Loading branch information
h-vetinari authored Sep 2, 2024
2 parents 37dcff5 + eeef683 commit 38c6c1e
Show file tree
Hide file tree
Showing 22 changed files with 170 additions and 68 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

3 changes: 2 additions & 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.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

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

15 changes: 11 additions & 4 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
13 changes: 10 additions & 3 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -11,12 +15,15 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
13 changes: 10 additions & 3 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -7,12 +11,15 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
7 changes: 0 additions & 7 deletions .ci_support/migrations/libxml2212.yaml

This file was deleted.

12 changes: 8 additions & 4 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '16'
- '17'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
10 changes: 7 additions & 3 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@ MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '16'
- '17'
libxml2:
- '2.12'
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libxml2:
- '2.12'
- '2'
target_platform:
- win-64
zlib:
- '1.2'
- '1'
4 changes: 2 additions & 2 deletions .gitattributes

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

25 changes: 23 additions & 2 deletions .gitignore

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

18 changes: 9 additions & 9 deletions .scripts/build_steps.sh

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

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh

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

15 changes: 11 additions & 4 deletions .scripts/run_osx_build.sh

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

9 changes: 7 additions & 2 deletions .scripts/run_win_build.bat

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

4 changes: 2 additions & 2 deletions azure-pipelines.yml

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

9 changes: 5 additions & 4 deletions build-locally.py

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

Loading

0 comments on commit 38c6c1e

Please sign in to comment.