这是indexloc提供的服务，不要输入任何密码
Skip to content

osx-arm64 support #19

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

Merged
merged 6 commits into from
Aug 8, 2020
Merged

osx-arm64 support #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abb3716
osx-arm64 support
isuruf Aug 8, 2020
ed4084d
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.6, and con…
Aug 8, 2020
fbf57e6
Fix lints
isuruf Aug 8, 2020
8b56bb7
Use native platforms
isuruf Aug 8, 2020
1a90585
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.6, and con…
Aug 8, 2020
66f9168
Merge branch 'master' into osx-arm64
isuruf Aug 8, 2020
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
36 changes: 19 additions & 17 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

85 changes: 14 additions & 71 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

38 changes: 0 additions & 38 deletions .azure-pipelines/build_steps.sh
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions .azure-pipelines/run_docker_build.sh
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions .ci_support/linux_.yaml → .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
c_compiler:
- gcc
c_compiler_version:
- '7'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-comp7
target_platform:
- linux-64
6 changes: 5 additions & 1 deletion .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
- '7'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge,c4aarch64,defaults
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-aarch64
target_platform:
- linux-aarch64
4 changes: 4 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
c_compiler:
- gcc
c_compiler_version:
- '8'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-ppc64le
target_platform:
- linux-ppc64le
4 changes: 4 additions & 0 deletions .ci_support/osx_.yaml → .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '10'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -10,3 +12,5 @@ macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
target_platform:
- osx-64
27 changes: 0 additions & 27 deletions .circleci/checkout_merge_commit.sh
View file
Open in desktop

This file was deleted.

22 changes: 8 additions & 14 deletions .circleci/config.yml
View file
Open in desktop

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

4 changes: 0 additions & 4 deletions .circleci/fast_finish_ci_pr_build.sh
View file
Open in desktop

This file was deleted.

Loading