From 90274395ee084d09e970c987bbf99f089a84cbc0 Mon Sep 17 00:00:00 2001 From: galabovaa Date: Fri, 10 Oct 2025 12:50:18 +0100 Subject: [PATCH] Revert "Replaces deprecated macos-13 runner with macos-15-intel runner" --- .github/workflows/build-nuget-package.yml | 14 +++++++------- .github/workflows/build-python-package.yml | 10 ++++++---- .github/workflows/build-wheels-push.yml | 2 +- .github/workflows/build-wheels.yml | 2 +- .github/workflows/test-fortran-macos.yml | 2 +- .github/workflows/test-nuget-macos.yml | 10 ++++++---- .github/workflows/test-nuget-package.yml | 10 ++++++---- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml index 426fcb1a26..390132b1a0 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: - # Build macos intel - build_macos_intel: - runs-on: macos-15-intel + # macos 13 is Intel + build_macos_13: + runs-on: macos-13 # strategy: # matrix: # python: [3.11] @@ -32,9 +32,9 @@ jobs: name: macos-x64 path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes - # Build macos arm64 - build_macos_arm: - runs-on: macos-14 # macos-14 is arm64 + # macos 14 is M1 + build_macos_14: + runs-on: macos-14 steps: - uses: actions/checkout@v4 - name: Build HiGHS @@ -126,7 +126,7 @@ jobs: build_windows: runs-on: windows-latest - needs: [build_macos_intel, build_macos_arm, 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 index 7b9a4b5532..595c5f4103 100644 --- a/.github/workflows/build-python-package.yml +++ b/.github/workflows/build-python-package.yml @@ -132,8 +132,9 @@ jobs: python3 -m pip install pytest python3 -m pytest $GITHUB_WORKSPACE - build_wheel_macos_intel: - runs-on: macos-15-intel + # macos 13 is Intel + build_wheel_macos_13: + runs-on: macos-13 strategy: matrix: python: [3.11] @@ -162,8 +163,9 @@ jobs: python3 -m pip install pytest python3 -m pytest $GITHUB_WORKSPACE - build_wheel_macos_arm: - runs-on: macos-14 # macos-14 is arm64 + # macos 14 is M1 + build_wheel_macos_14: + runs-on: macos-14 strategy: matrix: python: [3.11] diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml index 6de9d69b0d..51ba663730 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-15-intel, macosx_x86_64] + - [macos-13, 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 90f7acc953..99a332b61c 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-15-intel, macosx_x86_64] + - [macos-13, 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 38f110fffd..599e1f1043 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-15-intel] + runs-on: [macos-13] steps: diff --git a/.github/workflows/test-nuget-macos.yml b/.github/workflows/test-nuget-macos.yml index 6f73616740..24e466e0f5 100644 --- a/.github/workflows/test-nuget-macos.yml +++ b/.github/workflows/test-nuget-macos.yml @@ -7,8 +7,9 @@ concurrency: cancel-in-progress: true jobs: - build_macos_intel: - runs-on: macos-15-intel + # macos 13 is Intel + build_macos_13: + runs-on: macos-13 # strategy: # matrix: # python: [3.11] @@ -54,8 +55,9 @@ jobs: dotnet run - build_macos_arm: - runs-on: macos-14 # macos-14 is arm64 + # macos 14 is M1 + build_macos_14: + runs-on: macos-14 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 435e840cdd..a7aa3f44db 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -7,8 +7,9 @@ concurrency: cancel-in-progress: true jobs: - build_macos_intel: - runs-on: macos-15-intel + # macos 13 is Intel + build_macos_13: + runs-on: macos-13 # strategy: # matrix: # python: [3.11] @@ -55,8 +56,9 @@ jobs: - build_macos_arm: - runs-on: macos-14 # macos-14 is arm64 + # macos 14 is M1 + build_macos_14: + runs-on: macos-14 steps: - uses: actions/checkout@v4 - name: Build HiGHS