Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build-nuget-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/build-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-fortran-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
fast_build_release:
runs-on: [macos-13]
runs-on: [macos-15-intel]


steps:
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/test-nuget-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/test-nuget-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
Loading