Skip to content

Commit 6e50bea

Browse files
committed
Fix Windows conda: set activate-environment='' in setup-miniconda to prevent conda activate test failure
1 parent 3afd0e9 commit 6e50bea

1 file changed

Lines changed: 3 additions & 18 deletions

File tree

.github/actions/build_conda/action.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ runs:
3333
miniforge-version: latest # ensures conda-forge channel is used.
3434
channels: conda-forge
3535
conda-remove-defaults: 'true'
36+
activate-environment: ''
3637
# Set to runner.arch=aarch64 if we're on arm64 because
3738
# there's no miniforge ARM64 package, just aarch64.
3839
# They are the same thing, just named differently.
@@ -59,37 +60,21 @@ runs:
5960
shell: ${{ steps.choose_shell.outputs.shell }}
6061
run: nvidia-smi
6162
- name: Conda build (CPU)
62-
if: inputs.label == '' && inputs.cuda == '' && runner.os != 'Windows'
63+
if: inputs.label == '' && inputs.cuda == ''
6364
shell: ${{ steps.choose_shell.outputs.shell }}
6465
working-directory: conda
6566
run: |
6667
conda list --show-channel-urls
6768
conda build faiss --python 3.12 -c pytorch
68-
- name: Conda build (CPU, Windows)
69-
if: inputs.label == '' && inputs.cuda == '' && runner.os == 'Windows'
70-
shell: ${{ steps.choose_shell.outputs.shell }}
71-
working-directory: conda
72-
run: |
73-
conda list --show-channel-urls
74-
conda build faiss --python 3.12 -c pytorch --no-test
7569
- name: Conda build (CPU) w/ anaconda upload
76-
if: inputs.label != '' && inputs.cuda == '' && runner.os != 'Windows'
70+
if: inputs.label != '' && inputs.cuda == ''
7771
shell: ${{ steps.choose_shell.outputs.shell }}
7872
working-directory: conda
7973
env:
8074
PACKAGE_TYPE: ${{ inputs.label }}
8175
run: |
8276
conda list --show-channel-urls
8377
conda build faiss --python 3.12 --user pytorch --label ${{ inputs.label }} -c pytorch
84-
- name: Conda build (CPU) w/ anaconda upload (Windows)
85-
if: inputs.label != '' && inputs.cuda == '' && runner.os == 'Windows'
86-
shell: ${{ steps.choose_shell.outputs.shell }}
87-
working-directory: conda
88-
env:
89-
PACKAGE_TYPE: ${{ inputs.label }}
90-
run: |
91-
conda list --show-channel-urls
92-
conda build faiss --python 3.12 --user pytorch --label ${{ inputs.label }} -c pytorch --no-test
9378
- name: Conda build (GPU)
9479
if: inputs.label == '' && inputs.cuda != '' && inputs.cuvs == ''
9580
shell: ${{ steps.choose_shell.outputs.shell }}

0 commit comments

Comments
 (0)