Skip to content

Commit 7f90c80

Browse files
authored
Merge pull request #2261 from IntelPython/revert-gh-2251
Revert gh-2251
2 parents ad3d0d1 + 5c06579 commit 7f90c80

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

.github/workflows/conda-package.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ jobs:
8282
build_windows:
8383
runs-on: windows-latest
8484
timeout-minutes: 150
85+
defaults:
86+
run:
87+
shell: cmd /C CALL {0}
8588

8689
strategy:
8790
matrix:
@@ -98,17 +101,15 @@ jobs:
98101

99102
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
100103
with:
101-
miniforge-variant: Miniforge3
102104
miniforge-version: latest
103-
auto-activate: true
104-
activate-environment: base
105+
activate-environment: build
105106
channels: conda-forge
106107
conda-remove-defaults: true
107108
python-version: ${{ matrix.python }}
108109

109110
- name: Install conda build
110111
run: |
111-
conda install -n base -y conda-build
112+
conda install -y conda-build
112113
conda list -n base
113114
114115
- name: Cache conda packages
@@ -464,6 +465,9 @@ jobs:
464465
(github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
465466
runs-on: windows-latest
466467
timeout-minutes: 20
468+
defaults:
469+
run:
470+
shell: cmd /C CALL {0}
467471
strategy:
468472
matrix:
469473
python: ['3.10', '3.11', '3.12', '3.13', '3.14']
@@ -483,8 +487,7 @@ jobs:
483487
miniforge-version: latest
484488
channels: conda-forge
485489
conda-remove-defaults: true
486-
auto-activate: true
487-
activate-environment: base
490+
activate-environment: upload
488491

489492
- name: Install anaconda-client
490493
run: conda install anaconda-client -c conda-forge --override-channels

0 commit comments

Comments
 (0)