Run Mac tests on ARM and Intel (#4597)

* Run Mac tests on ARM and Intel

* Added missing environment file

* Removed obsolete code for M1 runner

* Removed obsolete code for M1 runner

.github/workflows/CI.yml

@@ -137,39 +137,28 @@ jobs:
               -DOPENMM_BUILD_OPENCL_LIB=OFF \
               -DOPENMM_BUILD_OPENCL_TESTS=OFF \
 
-          - name: MacOS Intel CPU/OpenCL Python 3.11
+          - name: MacOS Intel Python 3.11
             python-version: "3.11"
-            os: macos-latest
+            os: macos-13
             OPENCL: false
             cuda-version: ""
             CMAKE_FLAGS: |
               -DOPENMM_BUILD_OPENCL_LIB=ON \
               -DOPENMM_BUILD_OPENCL_TESTS=OFF \
 
-          #- name: MacOS M1 CPU arm64 Python 3.11
-          #  python-version: "3.11"
-          #  os: M1-arm64
-          #  OPENCL: false
-          #  cuda-version: ""
-          #  compilers: conda-forge
-          #  CMAKE_FLAGS: |
-          #    -DOPENMM_BUILD_OPENCL_LIB=ON \
-          #    -DOPENMM_BUILD_OPENCL_TESTS=OFF \
+          - name: MacOS ARM Python 3.11
+            python-version: "3.11"
+            os: macos-latest
+            OPENCL: false
+            cuda-version: ""
+            CMAKE_FLAGS: |
+              -DOPENMM_BUILD_OPENCL_LIB=ON \
+              -DOPENMM_BUILD_OPENCL_TESTS=OFF \
 
 
     steps:
       - uses: actions/checkout@v3
 
-      - uses: conda-incubator/setup-miniconda@v2
-        name: "Prepare base dependencies (M1)"
-        if: matrix.os == 'M1-arm64'
-        with:
-          python-version: ${{ matrix.python-version }}
-          activate-environment: build
-          installer-url: https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh#${{ github.run_number }}
-          environment-file: devtools/ci/gh-actions/conda-envs/build-${{ matrix.os }}.yml
-          auto-activate-base: false
-
       - uses: conda-incubator/setup-miniconda@v2
         name: "Prepare base dependencies"
         if: matrix.python-version == 'pypy'
@@ -182,7 +171,7 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v2
         name: "Prepare base dependencies"
-        if: matrix.os != 'M1-arm64' && matrix.python-version != 'pypy'
+        if: matrix.python-version != 'pypy'
         with:
           python-version: ${{ matrix.python-version }}
           activate-environment: build
@@ -228,23 +217,8 @@ jobs:
           restore-keys: |
             ccache-${{ secrets.CACHE_VERSION }}-${{ steps.prepare-ccache.outputs.key }}-
 
-      - name: "Configure build with CMake (M1)"
-        shell: bash -l {0}
-        if: matrix.os == 'M1-arm64'
-        run: |
-          mkdir build
-          cd build
-
-          /usr/bin/arch -arch arm64 cmake .. \
-            -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
-            -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            ${{ matrix.CMAKE_FLAGS }}
-
       - name: "Configure build with CMake"
         shell: bash -l {0}
-        if: matrix.os != 'M1-arm64'
         run: |
           mkdir build
           cd build
@@ -307,12 +281,6 @@ jobs:
           cd build/python/tests
           python -m pytest -v -n 2
 
-      - name: "Cleanup self-hosted runner (M1)"
-        shell: bash -l {0}
-        if: matrix.os == 'M1-arm64'
-        run: |
-          rm -rf /Users/runner/miniconda3/*
-
   windows:
     runs-on: windows-latest
     name: ${{ matrix.name }}

devtools/ci/gh-actions/conda-envs/build-M1-arm64.yml → devtools/ci/gh-actions/conda-envs/build-macos-13.yml

@@ -11,8 +11,9 @@ dependencies:
 - cython
 - swig
 - numpy <2.0
-- doxygen 1.9.1
+- doxygen 1.8.14
 # test
 - pytest
 - pytest-xdist
 - pytest-timeout
+