Skip to content

Commit

Permalink
Merge pull request conda-forge#8 from isuruf/4.8.5
Browse files Browse the repository at this point in the history
Update to 4.8.5
  • Loading branch information
nehaljwani committed Sep 18, 2020
2 parents 463237a + befd194 commit 1520612
Show file tree
Hide file tree
Showing 20 changed files with 236 additions and 119 deletions.
29 changes: 15 additions & 14 deletions .azure-pipelines/azure-pipelines-linux.yml

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

71 changes: 12 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.

52 changes: 30 additions & 22 deletions .azure-pipelines/azure-pipelines-win.yml

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

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 @@ -4,3 +4,5 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-comp7
target_platform:
- linux-64
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-aarch64
target_platform:
- linux-aarch64
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-ppc64le
target_platform:
- linux-ppc64le
4 changes: 2 additions & 2 deletions .ci_support/osx_.yaml → .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ channel_targets:
- conda-forge main
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
target_platform:
- osx-64
2 changes: 2 additions & 0 deletions .ci_support/win_.yaml → .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
target_platform:
- win-64
31 changes: 31 additions & 0 deletions .drone.yml

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

2 changes: 1 addition & 1 deletion .gitattributes

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

14 changes: 12 additions & 2 deletions .scripts/build_steps.sh

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

16 changes: 13 additions & 3 deletions .scripts/run_docker_build.sh

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

0 comments on commit 1520612

Please sign in to comment.