[bot-automerge] Rebuild for r400

automerged PR by conda-forge/automerge-action
conda-forge · Oct 10, 2020 · 575484d · 575484d
2 parents 3ce12ff + 6a80877
commit 575484d
Show file tree

Hide file tree

Showing 24 changed files with 389 additions and 345 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh
diff --git a/...upport/linux_target_platformlinux-64.yaml → ..._64_r_base3.6target_platformlinux-64.yaml b/...upport/linux_target_platformlinux-64.yaml → ..._64_r_base3.6target_platformlinux-64.yaml
@@ -16,8 +16,12 @@ docker_image:
 - condaforge/linux-anvil-comp7
 pin_run_as_build:
  r-base:
- max_pin: x.x.x
+ min_pin: x.x
+ max_pin: x.x
 r_base:
-- 3.5.1
+- '3.6'
 target_platform:
 - linux-64
+zip_keys:
+- - c_compiler_version
+ - cxx_compiler_version
diff --git a/.ci_support/osx_target_platformosx-64.yaml → ..._64_r_base4.0target_platformlinux-64.yaml b/.ci_support/osx_target_platformosx-64.yaml → ..._64_r_base4.0target_platformlinux-64.yaml
@@ -1,27 +1,27 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
 c_compiler:
-- clang
+- gcc
 c_compiler_version:
-- '4'
+- '7'
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 cran_mirror:
 - https://cran.r-project.org
 cxx_compiler:
-- clangxx
+- gxx
 cxx_compiler_version:
-- '4'
-macos_machine:
-- x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
+- '7'
+docker_image:
+- condaforge/linux-anvil-comp7
 pin_run_as_build:
  r-base:
- max_pin: x.x.x
+ min_pin: x.x
+ max_pin: x.x
 r_base:
-- 3.5.1
+- '4.0'
 target_platform:
-- osx-64
+- linux-64
+zip_keys:
+- - c_compiler_version
+ - cxx_compiler_version