Skip to content

Commit

Permalink
Merge pull request #21 from regro-cf-autotick-bot/bot-pr_arm_osx_ha89bae
Browse files Browse the repository at this point in the history
ARM OSX Migrator
  • Loading branch information
ocefpaf committed Aug 23, 2023
2 parents 34fd718 + 6708c84 commit 738fef7
Show file tree
Hide file tree
Showing 32 changed files with 717 additions and 380 deletions.
40 changes: 40 additions & 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.

36 changes: 36 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

7 changes: 6 additions & 1 deletion .ci_support/README

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

14 changes: 14 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-64
16 changes: 0 additions & 16 deletions .ci_support/linux_c_compilergcc.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .ci_support/linux_c_compilertoolchain_c.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
- osx-64
14 changes: 14 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
19 changes: 0 additions & 19 deletions .ci_support/osx_c_compilerclang.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions .ci_support/osx_c_compilertoolchain_c.yaml

This file was deleted.

40 changes: 0 additions & 40 deletions .circleci/build_steps.sh

This file was deleted.

27 changes: 0 additions & 27 deletions .circleci/checkout_merge_commit.sh

This file was deleted.

47 changes: 14 additions & 33 deletions .circleci/config.yml

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

This file was deleted.

50 changes: 0 additions & 50 deletions .circleci/run_docker_build.sh

This file was deleted.

Loading

0 comments on commit 738fef7

Please sign in to comment.