use contains

simpeg · Aug 20, 2024 · 53d31ed · 53d31ed
1 parent 5fa6e6b
commit 53d31ed
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -28,14 +28,16 @@ jobs:
           - os: macOS-latest
             python-major-version: 3
             python-minor-version: 8
+    env:
+      PYTHON_VERSION: ${{ matrix.python-major-version }}.${{matrix.python-minor-version}}
 
     steps:
     - uses: actions/checkout@v4
     - name: Setup Conda
       uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
-        python-version: ${{matrix.python-major-version }}.{{matrix.python-minor-version}
+        python-version: env.PYTHON_VERSION
     - name: Install Base Env
       run: |
         conda info
@@ -45,7 +47,7 @@ jobs:
 
     - name: Install MKL solver interface
       # Don't run this on the osx-arm images.
-      if: ${{ runner.os == 'macOS'}} and ${{ 'ARM' in runner.arch}}
+      if: not(${{ runner.os == 'macOS'}} and contains('ARM', runner.arch, 'ARM'))
       run:
         conda install --quiet --yes -c conda-forge pydiso