Merge pull request #1011 from mariusvniekerk/minor-tweaks

Some minor tweaks around azure and appveyor
conda-forge · Feb 2, 2019 · 3428c11 · 3428c11
2 parents 4ce995b + d1fea8d
commit 3428c11
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/conda_smithy/azure_ci_utils.py b/conda_smithy/azure_ci_utils.py
@@ -181,7 +181,7 @@ def register_repo(github_org, repo_name, project_id=AZURE_PROJECT_ID):
         bclient.update_definition(
             definition=build_definition,
             definition_id=ed.id,
-            project=ed.project,
+            project=ed.project.name,
         )
     else:
         bclient.create_definition(

diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py
@@ -965,7 +965,7 @@ def render_appveyor(jinja_env, forge_config, forge_dir):
     fast_finish_text = textwrap.dedent(
         """\
             {get_fast_finish_script}
-            {fast_finish_script} -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
+            "%CONDA_INSTALL_LOCN%\python.exe" {fast_finish_script}.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
         """
     )
     template_filename = "appveyor.yml.tmpl"

diff --git a/conda_smithy/templates/azure-pipelines-win.yml.tmpl b/conda_smithy/templates/azure-pipelines-win.yml.tmpl
@@ -77,6 +77,11 @@ jobs:
       displayName: conda-forge build setup
     {% endif %}
 
+    - script: |
+        rmdir C:\strawberry /s /q
+      continueOnError: true
+      displayname: remove strawberryperl
+
     # Special cased version setting some more things!
     - script: |
         conda.exe build recipe -m .ci_support\%CONFIG%.yaml

diff --git a/news/minor-tweaks.rst b/news/minor-tweaks.rst
@@ -0,0 +1,26 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* Appveyor will now use the conda python3.x executable to run the fast-finish script.
+* Azure windows builds are no longer silent.
+* Azure build definition updating now works.
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
+