Merge branch 'main' into macos-ci

dstansby · May 23, 2024 · 6156d19 · 6156d19
2 parents f135bd4 + 7ebe69a
commit 6156d19
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml
@@ -21,9 +21,10 @@ jobs:
           submodules: recursive
 
       - name: Set up Conda
-        uses: conda-incubator/[email protected].1
+        uses: conda-incubator/[email protected].4
         with:
             channels: conda-forge
+            miniforge-version: latest
             python-version: ${{ matrix.python-version }}
 
       - name: Show info about `base` environment

diff --git a/.github/workflows/ci-osx.yaml b/.github/workflows/ci-osx.yaml
@@ -21,7 +21,7 @@ jobs:
           submodules: recursive
 
       - name: Set up Conda
-        uses: conda-incubator/[email protected].1
+        uses: conda-incubator/[email protected].4
         with:
             channels: conda-forge
             miniforge-version: latest

diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml
@@ -21,9 +21,10 @@ jobs:
           submodules: recursive
 
       - name: Set up Conda
-        uses: conda-incubator/[email protected].1
+        uses: conda-incubator/[email protected].4
         with:
             channels: conda-forge
+            miniforge-version: latest
             python-version: ${{ matrix.python-version }}
 
       - name: Set up `env`