Skip to content

Commit

Permalink
Merge pull request #38 from isuruf/osx-arm64
Browse files Browse the repository at this point in the history
osx-arm64
  • Loading branch information
isuruf committed Aug 9, 2020
2 parents 5d4427a + 6d625a2 commit 800c9b4
Show file tree
Hide file tree
Showing 27 changed files with 215 additions and 340 deletions.
27 changes: 16 additions & 11 deletions .azure-pipelines/azure-pipelines-linux.yml

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

74 changes: 15 additions & 59 deletions .azure-pipelines/azure-pipelines-osx.yml

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

58 changes: 31 additions & 27 deletions .azure-pipelines/azure-pipelines-win.yml

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

75 changes: 0 additions & 75 deletions .azure-pipelines/run_docker_build.sh

This file was deleted.

2 changes: 2 additions & 0 deletions .ci_support/linux_.yaml → .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-comp7
target_platform:
- linux-64
4 changes: 3 additions & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ cdt_arch:
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
16 changes: 0 additions & 16 deletions .ci_support/linux_armv7l_.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-ppc64le
target_platform:
- linux-ppc64le
6 changes: 2 additions & 4 deletions .ci_support/osx_.yaml → .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -12,3 +8,5 @@ macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
target_platform:
- osx-64
12 changes: 12 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge main
macos_machine:
- arm64-apple-macos11
macos_min_version:
- '11.0'
target_platform:
- osx-arm64

0 comments on commit 800c9b4

Please sign in to comment.