From 49349a9cc26073497c3967b777b557767e8491c0 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 22 Feb 2024 11:39:51 -0500 Subject: [PATCH] Add M1 runners (#605) * Use startsWith in place of testing for exact matches in runner names --- .github/workflows/cmake.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 81bafa8f..e27fbb67 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -15,26 +15,26 @@ jobs: build_matrix: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-12, macos-14] gcc: [12] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - name: Linux dependencies - if: matrix.os == 'ubuntu-latest' + if: startsWith(matrix.os, 'ubuntu') run: | sudo apt update sudo apt install -y libcfitsio-dev gfortran pkg-config - name: MacOS dependencies - if: matrix.os == 'macos-latest' + if: startsWith(matrix.os, 'macos') run: | brew update brew install gcc@${{ matrix.gcc }} cfitsio - name: Linux build - if: matrix.os == 'ubuntu-latest' + if: startsWith(matrix.os, 'ubuntu') run: | mkdir -p build cd build @@ -44,7 +44,7 @@ jobs: make - name: MacOS build - if: matrix.os == 'macos-latest' + if: startsWith(matrix.os, 'macos') env: CC: gcc-${{ matrix.gcc }} CXX: g++-${{ matrix.gcc }}