Merge pull request #43 from regro-cf-autotick-bot/bot-pr_arm_osx_h20fe60

ARM OSX Migrator
conda-forge · Jan 29, 2022 · ba604e8 · ba604e8
2 parents 02727bb + b48ea15
commit ba604e8
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 46 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -9,7 +9,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 expat:
 - '2'
 target_platform:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,4 +1,7 @@
+build_platform:
+  osx_arm64: osx_64
 conda_forge_output_validation: true
-provider: {linux_aarch64: default, linux_ppc64le: default}
-build_platform: {osx_arm64: osx_64}
+provider:
+  linux_aarch64: default
+  linux_ppc64le: default
 test_on_native_only: true