TST: Try again [skip azp] [skip cirrus] [skip circle]

larsoner · Jul 20, 2023 · f4a2951 · f4a2951
1 parent 1b3e8d3
commit f4a2951
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     defaults:
       run:
-        shell: bash -e {0}
+        shell: bash -el {0}
     env:
       PYTHON_VERSION: '${{ matrix.python }}'
       MKL_NUM_THREADS: '1'
@@ -83,14 +83,11 @@ jobs:
           python-version: ${{ matrix.python }}
         if: startswith(matrix.kind, 'pip')
       # Python (if conda)
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v2
         with:
-          activate-environment: ${{ env.CONDA_ACTIVATE_ENV }}
-          python-version: ${{ env.PYTHON_VERSION }}
+          create-args: >-
+            python=${{ env.PYTHON_VERSION }}
           environment-file: ${{ env.CONDA_ENV }}
-          miniforge-version: latest
-          miniforge-variant: Mambaforge
-          use-mamba: ${{ matrix.kind != 'conda' }}
         if: ${{ !startswith(matrix.kind, 'pip') }}
       - name: 'Install OSMesa VTK variant'
         run: |

diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh
@@ -4,7 +4,7 @@ STD_ARGS="--progress-bar off --upgrade"
 EXTRA_ARGS=""
 if [ ! -z "$CONDA_ENV" ]; then
 	echo "Uninstalling MNE for CONDA_ENV=${CONDA_ENV}"
-	conda remove -c conda-forge --force -yq mne
+	mamba remove -c conda-forge --force -yq mne
 elif [ ! -z "$CONDA_DEPENDENCIES" ]; then
 	echo "Using Mamba to install CONDA_DEPENDENCIES=${CONDA_DEPENDENCIES}"
 	mamba install -y $CONDA_DEPENDENCIES