Skip to content

Commit

Permalink
Merge pull request #42 from Tobias-Fischer/1.10arm
Browse files Browse the repository at this point in the history
1.10arm migration
  • Loading branch information
Tobias-Fischer authored Apr 23, 2021
2 parents 4be66f9 + bc192ab commit 7de6ed3
Show file tree
Hide file tree
Showing 13 changed files with 260 additions and 39 deletions.
3 changes: 3 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.

32 changes: 32 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '11'
channel_sources:
- conda-forge/label/rust_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
freetype:
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
openexr:
- '2.5'
pin_run_as_build:
freetype:
max_pin: x
zlib:
max_pin: x.x
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
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.

31 changes: 28 additions & 3 deletions .scripts/build_steps.sh

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

35 changes: 35 additions & 0 deletions .scripts/logging_utils.sh

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

13 changes: 12 additions & 1 deletion .scripts/run_docker_build.sh

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

49 changes: 28 additions & 21 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.

13 changes: 11 additions & 2 deletions README.md

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

2 changes: 2 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
conda_forge_output_validation: true
provider: {linux_aarch64: default, linux_ppc64le: default}
build_platform: {osx_arm64: osx_64}
test_on_native_only: true
Loading

0 comments on commit 7de6ed3

Please sign in to comment.