diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml index 390132b1a04..426fcb1a26d 100644 --- 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 13 is Intel - build_macos_13: - runs-on: macos-13 + # Build macos intel + build_macos_intel: + runs-on: macos-15-intel # strategy: # matrix: # python: [3.11] @@ -32,9 +32,9 @@ jobs: name: macos-x64 path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes - # macos 14 is M1 - build_macos_14: - runs-on: macos-14 + # Build macos arm64 + build_macos_arm: + runs-on: macos-14 # macos-14 is arm64 steps: - uses: actions/checkout@v4 - name: Build HiGHS @@ -126,7 +126,7 @@ jobs: build_windows: runs-on: windows-latest - needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64] + needs: [build_macos_intel, build_macos_arm, 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 index 595c5f4103a..7b9a4b55327 100644 --- a/.github/workflows/build-python-package.yml +++ b/.github/workflows/build-python-package.yml @@ -132,9 +132,8 @@ jobs: python3 -m pip install pytest python3 -m pytest $GITHUB_WORKSPACE - # macos 13 is Intel - build_wheel_macos_13: - runs-on: macos-13 + build_wheel_macos_intel: + runs-on: macos-15-intel strategy: matrix: python: [3.11] @@ -163,9 +162,8 @@ jobs: python3 -m pip install pytest python3 -m pytest $GITHUB_WORKSPACE - # macos 14 is M1 - build_wheel_macos_14: - runs-on: macos-14 + build_wheel_macos_arm: + runs-on: macos-14 # macos-14 is arm64 strategy: matrix: python: [3.11] diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml index 51ba663730d..6de9d69b0d7 100644 --- a/.github/workflows/build-wheels-push.yml +++ b/.github/workflows/build-wheels-push.yml @@ -49,7 +49,7 @@ jobs: - [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test - [ubuntu-24.04, musllinux_i686] - [ubuntu-24.04-arm, musllinux_aarch64] - - [macos-13, macosx_x86_64] + - [macos-15-intel, macosx_x86_64] - [macos-14, macosx_arm64] - [windows-2022, win_amd64] - [windows-2022, win32] diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 99a332b61ca..90f7acc953b 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -38,7 +38,7 @@ jobs: - [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test - [ubuntu-24.04, musllinux_i686] - [ubuntu-24.04-arm, musllinux_aarch64] - - [macos-13, macosx_x86_64] + - [macos-15-intel, macosx_x86_64] - [macos-14, macosx_arm64] - [windows-2022, win_amd64] - [windows-2022, win32] diff --git a/.github/workflows/test-fortran-macos.yml b/.github/workflows/test-fortran-macos.yml index 599e1f10430..38f110fffd6 100644 --- 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-13] + runs-on: [macos-15-intel] steps: diff --git a/.github/workflows/test-nuget-macos.yml b/.github/workflows/test-nuget-macos.yml index 24e466e0f52..6f73616740f 100644 --- a/.github/workflows/test-nuget-macos.yml +++ b/.github/workflows/test-nuget-macos.yml @@ -7,9 +7,8 @@ concurrency: cancel-in-progress: true jobs: - # macos 13 is Intel - build_macos_13: - runs-on: macos-13 + build_macos_intel: + runs-on: macos-15-intel # strategy: # matrix: # python: [3.11] @@ -55,9 +54,8 @@ jobs: dotnet run - # macos 14 is M1 - build_macos_14: - runs-on: macos-14 + build_macos_arm: + runs-on: macos-14 # macos-14 is arm64 steps: - uses: actions/checkout@v4 - name: Build HiGHS diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index a7aa3f44db7..435e840cddd 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -7,9 +7,8 @@ concurrency: cancel-in-progress: true jobs: - # macos 13 is Intel - build_macos_13: - runs-on: macos-13 + build_macos_intel: + runs-on: macos-15-intel # strategy: # matrix: # python: [3.11] @@ -56,9 +55,8 @@ jobs: - # macos 14 is M1 - build_macos_14: - runs-on: macos-14 + build_macos_arm: + runs-on: macos-14 # macos-14 is arm64 steps: - uses: actions/checkout@v4 - name: Build HiGHS