Merge pull request #2010 from ERGO-Code/ci-update-macos

Update GitHub macOS runner
ERGO-Code · Nov 4, 2024 · c651664 · c651664
2 parents 588b8a9 + e7b3ac0
commit c651664
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 50 deletions.
diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml
@@ -7,9 +7,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # macos 12 is Intel
-  build_macos_12:
-    runs-on: macos-12
+  # macos 13 is Intel
+  build_macos_13:
+    runs-on: macos-13
     # strategy:
       # matrix:
       #   python: [3.11]
@@ -32,7 +32,7 @@ jobs:
           name: macos-x64
           path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
 
-  # macos 14 is M1 (beta)
+  # macos 14 is M1
   build_macos_14:
     runs-on: macos-14 
     steps:
@@ -124,7 +124,7 @@ jobs:
 
   build_windows:
     runs-on: windows-latest
-    needs: [build_macos_12, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
+    needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS Windows native

diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
@@ -105,38 +105,6 @@ jobs:
           python3 -m pip install pytest
           python3 -m pytest $GITHUB_WORKSPACE
           
-          
-  # macos 12 is Intel
-  build_wheel_macos_12:
-    runs-on: macos-12
-    strategy:
-      matrix:
-        python: [3.11]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install correct python version
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: Build wheel
-        run: |
-          python3 -m pip install cibuildwheel
-          python3 -m cibuildwheel --only cp311-macosx_x86_64 $GITHUB_WORKSPACE
-
-      - name: Install wheel
-        run: |
-          ls wheelhouse
-          python3 --version
-          python3 -m pip install wheelhouse/*.whl
-          python3 -c "import highspy; print(dir(highspy))"
-
-      - name: Test highspy
-        run: |
-          python3 -m pip install pytest 
-          python3 -m pytest $GITHUB_WORKSPACE
-            
   # macos 13 is Intel
   build_wheel_macos_13:
     runs-on: macos-13
@@ -168,7 +136,7 @@ jobs:
           python3 -m pip install pytest
           python3 -m pytest $GITHUB_WORKSPACE
             
-  # macos 14 is M1 (beta)
+  # macos 14 is M1
   build_wheel_macos_14:
     runs-on: macos-14 
     strategy:

diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
@@ -48,7 +48,7 @@ jobs:
           - [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
           - [ubuntu-20.04, musllinux_i686]
           - [ubuntu-20.04, musllinux_aarch64]
-          - [macos-12, macosx_x86_64]
+          - [macos-13, macosx_x86_64]
           - [macos-14, macosx_arm64]
           - [windows-2019, win_amd64]
           - [windows-2019, win32]

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -35,7 +35,7 @@ jobs:
           - [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
           - [ubuntu-20.04, musllinux_i686]
           - [ubuntu-20.04, musllinux_aarch64]
-          - [macos-12, macosx_x86_64]
+          - [macos-13, macosx_x86_64]
           - [macos-14, macosx_arm64]
           - [windows-2019, win_amd64]
           - [windows-2019, win32]

diff --git a/.github/workflows/test-fortran-macos.yml b/.github/workflows/test-fortran-macos.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   fast_build_release:
-    runs-on: macos-12 
+    runs-on: [macos-13]
 
 
     steps:

diff --git a/.github/workflows/test-nuget-macos.yml b/.github/workflows/test-nuget-macos.yml
@@ -7,9 +7,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # macos 12 is Intel
-  build_macos_12:
-    runs-on: macos-12
+  # macos 13 is Intel
+  build_macos_13:
+    runs-on: macos-13
     # strategy:
       # matrix:
       #   python: [3.11]
@@ -54,9 +54,8 @@ jobs:
           dotnet add package Highs.Native -s ${{runner.workspace}}/nugets 
           dotnet run
 
-
             
-  # macos 14 is M1 (beta)
+  # macos 14 is M1
   build_macos_14:
     runs-on: macos-14 
     steps:

diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml
@@ -7,9 +7,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # macos 12 is Intel
-  build_macos_12:
-    runs-on: macos-12
+  # macos 13 is Intel
+  build_macos_13:
+    runs-on: macos-13
     # strategy:
       # matrix:
       #   python: [3.11]
@@ -56,7 +56,7 @@ jobs:
 
 
             
-  # macos 14 is M1 (beta)
+  # macos 14 is M1
   build_macos_14:
     runs-on: macos-14 
     steps: