Skip to content

Commit

Permalink
Forward port arm64 patch from 14.x to 15.x (#314)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
conda-forge-admin authored Feb 16, 2025
2 parents d93719d + 296b9d6 commit 481dc05
Show file tree
Hide file tree
Showing 23 changed files with 319 additions and 132 deletions.
7 changes: 4 additions & 3 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.

48 changes: 32 additions & 16 deletions .azure-pipelines/azure-pipelines-win.yml

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

25 changes: 11 additions & 14 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- conda
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
- quay.io/condaforge/linux-anvil-x86_64:alma9
libxml2:
- '2.12'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- '2'
python_min:
- '3.9'
target_platform:
- linux-64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
20 changes: 11 additions & 9 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
cdt_arch:
- aarch64
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
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
- quay.io/condaforge/linux-anvil-x86_64:alma9
libxml2:
- '2.12'
- '2'
python_min:
- '3.9'
target_platform:
- linux-aarch64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
16 changes: 11 additions & 5 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
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
- quay.io/condaforge/linux-anvil-x86_64:alma9
libxml2:
- '2.12'
- '2'
python_min:
- '3.9'
target_platform:
- linux-ppc64le
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
7 changes: 0 additions & 7 deletions .ci_support/migrations/libxml2212.yaml

This file was deleted.

16 changes: 11 additions & 5 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
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'
- '18'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
python_min:
- '3.9'
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
14 changes: 11 additions & 3 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
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'
- '18'
libxml2:
- '2.12'
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
python_min:
- '3.9'
target_platform:
- osx-arm64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
8 changes: 6 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libxml2:
- '2.12'
- '2'
python_min:
- '3.9'
target_platform:
- win-64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
4 changes: 2 additions & 2 deletions .gitattributes

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

26 changes: 25 additions & 1 deletion .gitignore

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

Loading

0 comments on commit 481dc05

Please sign in to comment.