Skip to content

Commit

Permalink
Merge pull request #23 from isuruf/arm64
Browse files Browse the repository at this point in the history
osx-arm64 target
  • Loading branch information
isuruf committed Oct 14, 2020
2 parents 4aaacaf + a674923 commit 6f06749
Show file tree
Hide file tree
Showing 22 changed files with 258 additions and 71 deletions.
10 changes: 6 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml

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

17 changes: 12 additions & 5 deletions .azure-pipelines/azure-pipelines-osx.yml

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

Expand Up @@ -2,6 +2,8 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cross_platform:
- osx-64
cxx_compiler:
- gxx
cxx_compiler_version:
Expand All @@ -17,5 +19,10 @@ pin_run_as_build:
max_pin: x
zlib:
max_pin: x.x
target_platform:
- linux-64
zip_keys:
- - macos_machine
- cross_platform
zlib:
- '1.2'
@@ -0,0 +1,28 @@
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cross_platform:
- osx-arm64
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7
libuuid:
- 2.32.1
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
libuuid:
max_pin: x
zlib:
max_pin: x.x
target_platform:
- linux-64
zip_keys:
- - macos_machine
- cross_platform
zlib:
- '1.2'
Expand Up @@ -4,16 +4,21 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cross_platform:
- osx-64
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '*'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- osx-64
zip_keys:
- - macos_machine
- cross_platform
zlib:
- '1.2'
@@ -0,0 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cross_platform:
- osx-arm64
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '*'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- osx-64
zip_keys:
- - macos_machine
- cross_platform
zlib:
- '1.2'
@@ -0,0 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- https://conda-web.anaconda.org/conda-forge,conda-forge/label/llvm_rc
channel_targets:
- conda-forge main
cross_platform:
- osx-64
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '*'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- osx-arm64
zip_keys:
- - macos_machine
- cross_platform
zlib:
- '1.2'
@@ -0,0 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- https://conda-web.anaconda.org/conda-forge,conda-forge/label/llvm_rc
channel_targets:
- conda-forge main
cross_platform:
- osx-arm64
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '*'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- osx-arm64
zip_keys:
- - macos_machine
- cross_platform
zlib:
- '1.2'
2 changes: 1 addition & 1 deletion .github/CODEOWNERS

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

30 changes: 23 additions & 7 deletions .scripts/build_steps.sh

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

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

9 changes: 7 additions & 2 deletions .scripts/run_osx_build.sh

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

2 changes: 1 addition & 1 deletion LICENSE.txt

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

0 comments on commit 6f06749

Please sign in to comment.