From 6b40c8a891bcbbe67fe2d971cb276368da630748 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 14 Apr 2018 04:03:36 -0500 Subject: [PATCH] Workaround for 32-bit issue --- conda_smithy/configure_feedstock.py | 7 ++++--- conda_smithy/templates/appveyor.yml.tmpl | 9 +++++++-- conda_smithy/templates/circle.yml.tmpl | 2 +- conda_smithy/templates/travis.yml.tmpl | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index 82ecd4ff9..d3da8631f 100755 --- 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 index 4db767b87..f5aa77428 100644 --- 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 index ecf57a7c0..6774420ea 100644 --- 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 index d5982864e..9878207cd 100644 --- 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 %}