Skip to content

Commit 33c7a18

Browse files
authored
Merge pull request #287 from WiresmithTech/fix/conda-ci-errors
Fix Conda Installs on Mac in CI
2 parents 694e900 + 01563dc commit 33c7a18

File tree

1 file changed

+25
-22
lines changed

1 file changed

+25
-22
lines changed

.github/workflows/ci.yml

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,32 +79,32 @@ jobs:
7979
8080
conda:
8181
name: conda
82-
runs-on: ${{matrix.os}}-latest
82+
runs-on: ${{matrix.os}}
8383
strategy:
8484
fail-fast: false
8585
matrix:
8686
include:
87-
- {os: ubuntu, version: 1.8.16, channel: conda-forge, rust: stable}
88-
- {os: windows, version: 1.8.17, channel: conda-forge, rust: stable}
89-
- {os: macos, version: 1.8.18, channel: anaconda, rust: stable}
90-
- {os: ubuntu, version: 1.8.20, channel: anaconda, rust: beta}
91-
- {os: ubuntu, version: 1.10.1, channel: anaconda, rust: nightly}
92-
- {os: windows, version: 1.10.2, channel: anaconda, rust: beta}
93-
- {os: ubuntu, version: 1.10.3, channel: conda-forge, rust: nightly}
94-
- {os: windows, version: 1.10.4, channel: anaconda, rust: nightly}
95-
- {os: ubuntu, version: 1.10.4, mpi: openmpi, channel: conda-forge, rust: stable}
96-
- {os: ubuntu, version: 1.10.5, channel: conda-forge, rust: beta}
97-
- {os: macos, version: 1.10.5, mpi: openmpi, channel: conda-forge, rust: beta}
98-
- {os: ubuntu, version: 1.10.6, channel: anaconda, rust: stable}
99-
- {os: ubuntu, version: 1.10.6, mpi: mpich, channel: conda-forge, rust: nightly}
87+
- {os: ubuntu-latest, version: 1.8.16, channel: conda-forge, rust: stable}
88+
- {os: windows-latest, version: 1.8.17, channel: conda-forge, rust: stable}
89+
- {os: macos-13, version: 1.8.18, channel: anaconda, rust: stable}
90+
- {os: ubuntu-latest, version: 1.8.20, channel: anaconda, rust: beta}
91+
- {os: ubuntu-latest, version: 1.10.1, channel: anaconda, rust: nightly}
92+
- {os: windows-latest, version: 1.10.2, channel: anaconda, rust: beta}
93+
- {os: ubuntu-latest, version: 1.10.3, channel: conda-forge, rust: nightly}
94+
- {os: windows-latest, version: 1.10.4, channel: anaconda, rust: nightly}
95+
- {os: ubuntu-latest, version: 1.10.4, mpi: openmpi, channel: conda-forge, rust: stable}
96+
- {os: ubuntu-latest, version: 1.10.5, channel: conda-forge, rust: beta}
97+
- {os: macos-13, version: 1.10.5, mpi: openmpi, channel: conda-forge, rust: beta}
98+
- {os: ubuntu-latest, version: 1.10.6, channel: anaconda, rust: stable}
99+
- {os: ubuntu-latest, version: 1.10.6, mpi: mpich, channel: conda-forge, rust: nightly}
100100
# - {os: ubuntu, version: 1.10.8, channel: conda-forge, rust: stable}
101-
- {os: ubuntu, version: 1.12.0, mpi: openmpi, channel: conda-forge, rust: stable}
102-
- {os: macos, version: 1.12.0, channel: conda-forge, rust: stable}
103-
- {os: windows, version: 1.12.0, channel: conda-forge, rust: stable}
104-
- {os: ubuntu, version: 1.12.1, channel: conda-forge, rust: stable}
105-
- {os: macos, version: 1.14.0, channel: conda-forge, rust: stable}
106-
- {os: windows, version: 1.14.0, channel: conda-forge, rust: stable}
107-
- {os: ubuntu, version: 1.14.0, channel: conda-forge, rust: stable}
101+
- {os: ubuntu-latest, version: 1.12.0, mpi: openmpi, channel: conda-forge, rust: stable}
102+
- {os: macos-latest, version: 1.12.0, channel: conda-forge, rust: stable}
103+
- {os: windows-latest, version: 1.12.0, channel: conda-forge, rust: stable}
104+
- {os: ubuntu-latest, version: 1.12.1, channel: conda-forge, rust: stable}
105+
- {os: macos-latest, version: 1.14.0, channel: conda-forge, rust: stable}
106+
- {os: windows-latest, version: 1.14.0, channel: conda-forge, rust: stable}
107+
- {os: ubuntu-latest, version: 1.14.0, channel: conda-forge, rust: stable}
108108
defaults:
109109
run:
110110
shell: bash -l {0}
@@ -117,7 +117,10 @@ jobs:
117117
with: {toolchain: '${{matrix.rust}}'}
118118
- name: Install conda
119119
uses: conda-incubator/setup-miniconda@v2
120-
with: {auto-update-conda: false, activate-environment: testenv}
120+
with: {auto-update-conda: false, activate-environment: testenv, miniconda-version: latest}
121+
- name: Set conda for Arm64
122+
if: runner.arch == 'arm64' && runner.os == 'macOS'
123+
run: conda config --env --set subdir osx-arm64
121124
- name: Install HDF5 (${{matrix.version}}${{matrix.mpi && '-' || ''}}${{matrix.mpi}})
122125
run: |
123126
[ "${{matrix.mpi}}" != "" ] && MPICC_PKG=${{matrix.mpi}}-mpicc

0 commit comments

Comments
 (0)