Skip to content

Commit d5a8c57

Browse files
authored
Merge branch 'master' into setup-miniconda-configurable-cache
2 parents 2adcfba + 81047fa commit d5a8c57

File tree

3 files changed

+15
-41
lines changed

3 files changed

+15
-41
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,12 @@ jobs:
107107
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
108108
with:
109109
miniforge-version: latest
110-
use-mamba: true
110+
use-mamba: 'true'
111111
channels: conda-forge
112+
conda-remove-defaults: 'true'
112113
python-version: ${{ env.python-ver }}
113114
activate-environment: 'docs'
114115

115-
# Here is an issue in conda gh-12356 causing adding defaults to the list of channels
116-
# upon running `conda config --append channels conda-forge`, while mamba requires to have only conda-forge channel
117-
- name: Remove defaults channel
118-
run: |
119-
conda config --remove channels defaults
120-
conda config --show
121-
122116
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
123117
- name: Disable speed limit check in mamba
124118
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV

.github/workflows/conda-package.yml

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,13 @@ jobs:
7777
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
7878
with:
7979
miniforge-version: latest
80-
use-mamba: true
80+
use-mamba: 'true'
8181
channels: conda-forge
82+
conda-remove-defaults: 'true'
8283
python-version: ${{ matrix.python }}
8384
activate-environment: 'build'
8485
pkgs-dirs: ${{ env.CONDA_PKGS_DIR }}
8586

86-
# Here is an issue in conda gh-12356 causing adding defaults to the list of channels
87-
# upon running `conda config --append channels conda-forge`, while mamba requires to have only conda-forge channel
88-
- name: Remove defaults channel
89-
run: |
90-
conda config --remove channels defaults
91-
conda config --show
92-
9387
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
9488
- name: Disable speed limit check in mamba
9589
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV
@@ -161,15 +155,13 @@ jobs:
161155
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
162156
with:
163157
miniforge-version: latest
164-
use-mamba: true
158+
use-mamba: 'true'
165159
channels: conda-forge
160+
conda-remove-defaults: 'true'
166161
python-version: ${{ matrix.python }}
167162
activate-environment: ${{ env.TEST_ENV_NAME }}
168163
pkgs-dirs: ${{ env.onda-pkgs }}
169164

170-
- name: Remove defaults channel
171-
run: conda config --remove channels defaults
172-
173165
- name: Install conda-index
174166
run: mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
175167

@@ -292,15 +284,13 @@ jobs:
292284
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
293285
with:
294286
miniforge-version: latest
295-
use-mamba: true
287+
use-mamba: 'true'
296288
channels: conda-forge
289+
conda-remove-defaults: 'true'
297290
python-version: ${{ matrix.python }}
298291
activate-environment: ${{ env.TEST_ENV_NAME }}
299292
pkgs-dirs: ${{ env.onda-pkgs }}
300293

301-
- name: Remove defaults channel
302-
run: conda config --remove channels defaults
303-
304294
- name: Store conda paths as envs
305295
run: |
306296
@echo on
@@ -439,14 +429,12 @@ jobs:
439429
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
440430
with:
441431
miniforge-version: latest
442-
use-mamba: true
432+
use-mamba: 'true'
443433
channels: conda-forge
434+
conda-remove-defaults: 'true'
444435
python-version: ${{ matrix.python }}
445436
activate-environment: 'upload'
446437

447-
- name: Remove defaults channel
448-
run: conda config --remove channels defaults
449-
450438
- name: Install anaconda-client
451439
run: mamba install anaconda-client
452440

@@ -478,15 +466,13 @@ jobs:
478466
- uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
479467
with:
480468
miniforge-version: latest
481-
use-mamba: true
469+
use-mamba: 'true'
482470
channels: conda-forge
483-
run-post: false
471+
conda-remove-defaults: 'true'
472+
run-post: 'false'
484473
python-version: '3.12'
485474
activate-environment: 'cleanup'
486475

487-
- name: Remove defaults channel
488-
run: conda config --remove channels defaults
489-
490476
- name: Install anaconda-client
491477
run: mamba install anaconda-client
492478

.github/workflows/generate_coverage.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,12 @@ jobs:
6565
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
6666
with:
6767
miniforge-version: latest
68-
use-mamba: true
68+
use-mamba: 'true'
6969
channels: conda-forge
70+
conda-remove-defaults: 'true'
7071
python-version: ${{ env.python-ver }}
7172
activate-environment: 'coverage'
7273

73-
# Here is an issue in conda gh-12356 causing adding defaults to the list of channels
74-
# upon running `conda config --append channels conda-forge`, while mamba requires to have only conda-forge channel
75-
- name: Remove defaults channel
76-
run: |
77-
conda config --remove channels defaults
78-
conda config --show
79-
8074
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
8175
- name: Disable speed limit check in mamba
8276
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV

0 commit comments

Comments
 (0)