Merge build and host envs

automerged PR by regro-cf-autotick-bot-action
conda-forge · May 16, 2020 · 80f170e · 80f170e
2 parents 41b5bc1 + acbed6d
commit 80f170e
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 69 deletions.
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/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "4.5.2" %}
-{% set build = 5 %}
+{% set build = 6 %}
 
 # recipe-lint fails if mpi is undefined
 {% set mpi = mpi or 'nompi' %}
@@ -21,6 +21,7 @@ source:
 build:
   number: {{ build }}
   skip: True  # [win]
+  merge_build_host: True
 
   # add build string so packages can depend on
   # mpi or nompi variants explicitly: