Skip to content

GitLab

Unverified Commit 53b062ca authored by Francisco Massa's avatar Francisco Massa Committed by GitHub
Browse files

Try fix Windows CircleCI (#1433) 

* Try fix Windows CircleCI

* Try conda init first

* Use newer orb
parent 261f234d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
.circleci/config.yml
View file @ 53b062ca
...@@ -7,7 +7,7 @@ version: 2.1 ...@@ -7,7 +7,7 @@ version: 2.1
# Job names are 'name:' key. # Job names are 'name:' key.
orbs: orbs:
win: circleci/windows@1.0.0 win: circleci/windows@2.0.0
commands: commands:
checkout_merge: checkout_merge:
...@@ -171,15 +171,16 @@ jobs: ...@@ -171,15 +171,16 @@ jobs:
binary_win_conda: binary_win_conda:
<<: *binary_common <<: *binary_common
executor: executor:
name: win/vs2019 name: win/default
shell: bash.exe shell: bash.exe
steps: steps:
- checkout_merge - checkout_merge
- run: - run:
command: | command: |
choco install miniconda3 choco install miniconda3
$env:PATH = "C:\tools\miniconda3;C:\tools\miniconda3\Library\usr\bin;C:\tools\miniconda3\Scripts;C:\tools\miniconda3\bin" + $env:PATH (& "C:\tools\miniconda3\Scripts\conda.exe" "shell.powershell" "hook") | Out-String | Invoke-Expression
conda install -yq conda-build "conda-package-handling<1.5.0" conda activate base
conda install -yq conda-build "conda-package-handling!=1.5.0"
bash packaging/build_conda.sh bash packaging/build_conda.sh
shell: powershell.exe shell: powershell.exe
......
.circleci/config.yml.in
View file @ 53b062ca
...@@ -7,7 +7,7 @@ version: 2.1 ...@@ -7,7 +7,7 @@ version: 2.1
# Job names are 'name:' key. # Job names are 'name:' key.
orbs: orbs:
win: circleci/windows@1.0.0 win: circleci/windows@2.0.0
commands: commands:
checkout_merge: checkout_merge:
...@@ -171,15 +171,16 @@ jobs: ...@@ -171,15 +171,16 @@ jobs:
binary_win_conda: binary_win_conda:
<<: *binary_common <<: *binary_common
executor: executor:
name: win/vs2019 name: win/default
shell: bash.exe shell: bash.exe
steps: steps:
- checkout_merge - checkout_merge
- run: - run:
command: | command: |
choco install miniconda3 choco install miniconda3
$env:PATH = "C:\tools\miniconda3;C:\tools\miniconda3\Library\usr\bin;C:\tools\miniconda3\Scripts;C:\tools\miniconda3\bin" + $env:PATH (& "C:\tools\miniconda3\Scripts\conda.exe" "shell.powershell" "hook") | Out-String | Invoke-Expression
conda install -yq conda-build "conda-package-handling<1.5.0" conda activate base
conda install -yq conda-build "conda-package-handling!=1.5.0"
bash packaging/build_conda.sh bash packaging/build_conda.sh
shell: powershell.exe shell: powershell.exe
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment