tidy up ci.yml

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "ubuntu-latest", "macos-latest", "windows-latest"]
+        os: [ "ubuntu-latest", "macos-latest", "macos-14", "windows-latest"]
         python-version: [ "3.9", "3.11", "3.12" ]
     steps:
       - name: Cancel previous runs
@@ -32,52 +32,22 @@ jobs:
           token: ${{ github.token }}
       - name: conda_setup
         uses: conda-incubator/setup-miniconda@v2
+        if: matrix.os != "macos-14"
         with:
           activate-environment: geocat_viz_build
           channel-priority: strict
           python-version: ${{ matrix.python-version }}
           channels: conda-forge
           environment-file: build_envs/environment.yml
-
-      - name: Install geocat-viz
-        run: |
-          python -m pip install . --no-deps
-
-      - name: conda list
-        run: |
-          conda list
-
-  test_M1:
-    name: Python (${{ matrix.python-version }}, ${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: bash -l {0}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ "macos-14" ]
-        python-version: [ "3.9", "3.11", "3.12" ]
-    steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-      - name: checkout
-        uses: actions/checkout@v3
-        with:
-          token: ${{ github.token }}
-      - name: conda_setup
         uses: conda-incubator/setup-miniconda@v2
+        if: matrix.os == "macos-14"
         with:
           installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh
+          activate-environment: geocat_viz_build
+          channel-priority: strict
           python-version: ${{ matrix.python-version }}
           channels: conda-forge
-          channel-priority: strict
           environment-file: build_envs/environment.yml
-          activate-environment: geocat_viz_build
-
       - name: Install geocat-viz
         run: |
           python -m pip install . --no-deps