Skip to content

Commit 6156d19

Browse files
authored
Merge branch 'main' into macos-ci
2 parents f135bd4 + 7ebe69a commit 6156d19

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/ci-linux.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ jobs:
2121
submodules: recursive
2222

2323
- name: Set up Conda
24-
uses: conda-incubator/[email protected].1
24+
uses: conda-incubator/[email protected].4
2525
with:
2626
channels: conda-forge
27+
miniforge-version: latest
2728
python-version: ${{ matrix.python-version }}
2829

2930
- name: Show info about `base` environment

.github/workflows/ci-osx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
submodules: recursive
2222

2323
- name: Set up Conda
24-
uses: conda-incubator/[email protected].1
24+
uses: conda-incubator/[email protected].4
2525
with:
2626
channels: conda-forge
2727
miniforge-version: latest

.github/workflows/ci-windows.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ jobs:
2121
submodules: recursive
2222

2323
- name: Set up Conda
24-
uses: conda-incubator/[email protected].1
24+
uses: conda-incubator/[email protected].4
2525
with:
2626
channels: conda-forge
27+
miniforge-version: latest
2728
python-version: ${{ matrix.python-version }}
2829

2930
- name: Set up `env`

0 commit comments

Comments
 (0)