Merge branch 'conda-lock-rename-macos' into HEAD

mkoeppe · May 20, 2024 · 9f13f33 · 9f13f33
2 parents 740916c + b0b7433
commit 9f13f33
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
@@ -70,7 +70,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           activate-environment: sage
-          environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && 'macos' || 'linux' }}.yml
+          environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(env.RUNNER_ARCH, "ARM") && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
       - name: Print Conda environment
         shell: bash -l {0}