From 50551e4b0cfe9c25e0b069476c0970955939a91f Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 18 Sep 2019 21:18:09 +0800 Subject: [PATCH 1/2] Fix Windows CI --- .circleci/config.yml | 2 +- .circleci/config.yml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cbbef4fdcd..2fe1b0ef1b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,7 @@ jobs: command: | choco install miniconda3 $env:PATH = "C:\tools\miniconda3;C:\tools\miniconda3\Library\usr\bin;C:\tools\miniconda3\Scripts;C:\tools\miniconda3\bin" + $env:PATH - conda install -yq conda-build + conda install -yq conda-build "conda-package-handling<1.15" bash packaging/build_conda.sh shell: powershell.exe diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index fe094ebcd1c..c26dfd53e26 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -176,7 +176,7 @@ jobs: command: | choco install miniconda3 $env:PATH = "C:\tools\miniconda3;C:\tools\miniconda3\Library\usr\bin;C:\tools\miniconda3\Scripts;C:\tools\miniconda3\bin" + $env:PATH - conda install -yq conda-build + conda install -yq conda-build "conda-package-handling<1.15" bash packaging/build_conda.sh shell: powershell.exe From 5b90d43260d552d5deb1e222b0bfac5cecbcdbec Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 18 Sep 2019 21:31:34 +0800 Subject: [PATCH 2/2] Use correct version --- .circleci/config.yml | 2 +- .circleci/config.yml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2fe1b0ef1b0..b112306b6fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,7 @@ jobs: command: | choco install miniconda3 $env:PATH = "C:\tools\miniconda3;C:\tools\miniconda3\Library\usr\bin;C:\tools\miniconda3\Scripts;C:\tools\miniconda3\bin" + $env:PATH - conda install -yq conda-build "conda-package-handling<1.15" + conda install -yq conda-build "conda-package-handling<1.5.0" bash packaging/build_conda.sh shell: powershell.exe diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index c26dfd53e26..52be9eef8fc 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -176,7 +176,7 @@ jobs: command: | choco install miniconda3 $env:PATH = "C:\tools\miniconda3;C:\tools\miniconda3\Library\usr\bin;C:\tools\miniconda3\Scripts;C:\tools\miniconda3\bin" + $env:PATH - conda install -yq conda-build "conda-package-handling<1.15" + conda install -yq conda-build "conda-package-handling<1.5.0" bash packaging/build_conda.sh shell: powershell.exe