Workaround for 32-bit issue

conda-forge · Apr 14, 2018 · 6b40c8a · 6b40c8a
1 parent 80a4777
commit 6b40c8a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py
@@ -234,7 +234,7 @@ def dump_subspace_config_files(metas, root_path, output_name):
     yaml.add_representer(set, yaml.representer.SafeRepresenter.represent_list)
     yaml.add_representer(tuple, yaml.representer.SafeRepresenter.represent_list)
 
-    config_names = []
+    result = []
     for config in configs:
         config_name = '{}_{}'.format(output_name, package_key(config, top_level_loop_vars,
                                                               metas[0].config.subdir))
@@ -245,8 +245,9 @@ def dump_subspace_config_files(metas, root_path, output_name):
 
         with write_file(out_path) as f:
             yaml.dump(config, f, default_flow_style=False)
-        config_names.append(config_name)
-    return sorted(config_names)
+        target_platform = config.get("target_platform", [""])[0]
+        result.append((config_name, target_platform))
+    return sorted(result)
 
 
 def _get_fast_finish_script(provider_name, forge_config, forge_dir, fast_finish_text):

diff --git a/conda_smithy/templates/appveyor.yml.tmpl b/conda_smithy/templates/appveyor.yml.tmpl
@@ -11,8 +11,13 @@ environment:
   {%- endfor %}
 
   matrix:
-  {%- for config in configs %}
+  {%- for config, platform in configs %}
     - CONFIG: {{ config}}
+  {%- if "win-32" in platform %}
+      CONDA_INSTALL_LOCN: C:\Miniconda36
+{% else %}
+      CONDA_INSTALL_LOCN: C:\Miniconda36-x64
+{% endif -%}
 {% endfor %}
 
 # We always use a 64-bit machine, but can build x86 distributions
@@ -29,7 +34,7 @@ install:
     - cmd: rmdir C:\cygwin /s /q
 
     # Add path, activate `conda` and update conda.
-    - cmd: call C:\Miniconda36-x64\Scripts\activate.bat
+    - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
     - cmd: conda.exe update --yes --quiet conda
 
     - cmd: set PYTHONUNBUFFERED=1

diff --git a/conda_smithy/templates/circle.yml.tmpl b/conda_smithy/templates/circle.yml.tmpl
@@ -14,7 +14,7 @@ jobs:
           # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
           command: exit 0
 {%- else %}
-{%- for config in configs %}
+{%- for config, _ in configs %}
   build_{{ config }}:
     working_directory: ~/test
     machine: true

diff --git a/conda_smithy/templates/travis.yml.tmpl b/conda_smithy/templates/travis.yml.tmpl
@@ -11,7 +11,7 @@ osx_image: xcode6.4
 env:
   {%- if configs[0] %}
   matrix:
-    {%- for config in configs %}
+    {%- for config, _ in configs %}
     - CONFIG={{ config }}
     {%- endfor %}
   {%- endif %}