Merge pull request #754 from dougalsutherland/conda-build-update-linux

Update conda-build for Linux builds
conda-forge · Apr 19, 2018 · 6dc6ff5 · 6dc6ff5
2 parents 957b218 + e1ae502
commit 6dc6ff5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/conda_smithy/templates/run_docker_build.tmpl b/conda_smithy/templates/run_docker_build.tmpl
@@ -56,7 +56,8 @@ echo "$config" > ~/.condarc
 # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
 conda clean --lock
 
-conda install --yes --quiet conda-forge-ci-setup=1
+# Make sure we pull in the latest conda-build version too
+conda install --yes --quiet conda-forge-ci-setup=1 conda-build
 {% if build_setup -%}
 {{ build_setup }}{% endif -%}
 

diff --git a/news/update-conda-build.rst b/news/update-conda-build.rst
@@ -0,0 +1,13 @@
+**Added:** None
+
+* Update conda-build in the docker build script
+
+**Changed:** None
+
+**Deprecated:** None
+
+**Removed:** None
+
+**Fixed:** None
+
+**Security:** None