Skip to content

Commit 4554aa4

Browse files
committed
clean up windows build workflows
1 parent b052459 commit 4554aa4

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/conda-package-cf.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,10 @@ jobs:
185185
with:
186186
miniforge-variant: Miniforge3
187187
miniforge-version: latest
188-
activate-environment: build
188+
auto-activate: true
189+
activate-environment: base
189190
channels: conda-forge
190-
conda-remove-defaults: "true"
191+
conda-remove-defaults: true
191192
python-version: ${{ matrix.python }}
192193

193194
- name: Cache conda packages
@@ -249,11 +250,10 @@ jobs:
249250

250251
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
251252
with:
252-
miniforge-variant: Miniforge3
253253
miniforge-version: latest
254-
activate-environment: mkl_umath_test
255254
channels: conda-forge
256-
conda-remove-defaults: "true"
255+
conda-remove-defaults: true
256+
activate-environment: ${{ env.TEST_ENV_NAME }}
257257
python-version: ${{ matrix.python }}
258258

259259
- name: Install conda-index

.github/workflows/conda-package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,10 @@ jobs:
162162
with:
163163
miniforge-variant: Miniforge3
164164
miniforge-version: latest
165-
activate-environment: build
165+
auto-activate: true
166+
activate-environment: base
166167
channels: conda-forge
167-
conda-remove-defaults: "true"
168+
conda-remove-defaults: true
168169
python-version: ${{ matrix.python }}
169170

170171
- name: Cache conda packages
@@ -225,11 +226,10 @@ jobs:
225226

226227
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
227228
with:
228-
miniforge-variant: Miniforge3
229229
miniforge-version: latest
230-
activate-environment: mkl_umath_test
231230
channels: conda-forge
232-
conda-remove-defaults: "true"
231+
conda-remove-defaults: true
232+
activate-environment: ${{ env.TEST_ENV_NAME }}
233233
python-version: ${{ matrix.python }}
234234

235235
- name: Install conda-index

0 commit comments

Comments
 (0)