Skip to content

Commit 5b7c2d2

Browse files
committed
Revert "tweak workflows"
This reverts commit 8098447.
1 parent 8098447 commit 5b7c2d2

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

.github/workflows/cache-dependencies.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ jobs:
3535
uses: conda-incubator/setup-miniconda@v3
3636
with:
3737
miniforge-version: latest
38-
channels: conda-forge,defaults
3938
activate-environment: saltproc-env
40-
mamba-version: "*"
39+
use-mamba: true
4140
use-only-tar-bz2: true
4241
- run: |
43-
mamba config --env --set pip_interop_enabled True
42+
conda config --env --set pip_interop_enabled True
4443
4544
# check for existing cache
4645
- name: Set cache date
@@ -83,13 +82,12 @@ jobs:
8382
- name: Set up conda
8483
uses: conda-incubator/setup-miniconda@v3
8584
with:
86-
activate-environment: saltproc-doc-env
8785
miniforge-version: latest
88-
channels: conda-forge,defaults
89-
mamba-version: "*"
86+
activate-environment: saltproc-doc-env
87+
use-mamba: true
9088
use-only-tar-bz2: true
9189
- run: |
92-
mamba config --env --set pip_interop_enabled True
90+
conda config --env --set pip_interop_enabled True
9391
9492
# check for existing cache
9593
- name: Set cache date

.github/workflows/test-saltproc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ jobs:
4040
uses: conda-incubator/setup-miniconda@v3
4141
with:
4242
miniforge-version: latest
43-
channels: conda-forge,defaults
43+
channels: conda-forge
4444
activate-environment: saltproc-env
45-
mamba-version: "*"
45+
use-mamba: true
4646
use-only-tar-bz2: true
4747
- run: |
48-
mamba config --env --set pip_interop_enabled True
48+
conda config --env --set pip_interop_enabled True
4949
5050
# check for existing cache
5151
- name: Set cache date

0 commit comments

Comments
 (0)