Skip to content

Commit c780f58

Browse files
authored
Merge pull request #2555 from merschformann/master
Replaces deprecated macos-13 runner with macos-15-intel runner
2 parents d2539ec + ff250ac commit c780f58

File tree

7 files changed

+22
-28
lines changed

7 files changed

+22
-28
lines changed

.github/workflows/build-nuget-package.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
# macos 13 is Intel
11-
build_macos_13:
12-
runs-on: macos-13
10+
# Build macos intel
11+
build_macos_intel:
12+
runs-on: macos-15-intel
1313
# strategy:
1414
# matrix:
1515
# python: [3.11]
@@ -32,9 +32,9 @@ jobs:
3232
name: macos-x64
3333
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
3434

35-
# macos 14 is M1
36-
build_macos_14:
37-
runs-on: macos-14
35+
# Build macos arm64
36+
build_macos_arm:
37+
runs-on: macos-14 # macos-14 is arm64
3838
steps:
3939
- uses: actions/checkout@v4
4040
- name: Build HiGHS
@@ -126,7 +126,7 @@ jobs:
126126

127127
build_windows:
128128
runs-on: windows-latest
129-
needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
129+
needs: [build_macos_intel, build_macos_arm, build_windows_32, build_linux, build_linux_arm64]
130130
steps:
131131
- uses: actions/checkout@v4
132132
- name: Build HiGHS Windows native

.github/workflows/build-python-package.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ jobs:
132132
python3 -m pip install pytest
133133
python3 -m pytest $GITHUB_WORKSPACE
134134
135-
# macos 13 is Intel
136-
build_wheel_macos_13:
137-
runs-on: macos-13
135+
build_wheel_macos_intel:
136+
runs-on: macos-15-intel
138137
strategy:
139138
matrix:
140139
python: [3.11]
@@ -163,9 +162,8 @@ jobs:
163162
python3 -m pip install pytest
164163
python3 -m pytest $GITHUB_WORKSPACE
165164
166-
# macos 14 is M1
167-
build_wheel_macos_14:
168-
runs-on: macos-14
165+
build_wheel_macos_arm:
166+
runs-on: macos-14 # macos-14 is arm64
169167
strategy:
170168
matrix:
171169
python: [3.11]

.github/workflows/build-wheels-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
5050
- [ubuntu-24.04, musllinux_i686]
5151
- [ubuntu-24.04-arm, musllinux_aarch64]
52-
- [macos-13, macosx_x86_64]
52+
- [macos-15-intel, macosx_x86_64]
5353
- [macos-14, macosx_arm64]
5454
- [windows-2022, win_amd64]
5555
- [windows-2022, win32]

.github/workflows/build-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
3939
- [ubuntu-24.04, musllinux_i686]
4040
- [ubuntu-24.04-arm, musllinux_aarch64]
41-
- [macos-13, macosx_x86_64]
41+
- [macos-15-intel, macosx_x86_64]
4242
- [macos-14, macosx_arm64]
4343
- [windows-2022, win_amd64]
4444
- [windows-2022, win32]

.github/workflows/test-fortran-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
fast_build_release:
7-
runs-on: [macos-13]
7+
runs-on: [macos-15-intel]
88

99

1010
steps:

.github/workflows/test-nuget-macos.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
# macos 13 is Intel
11-
build_macos_13:
12-
runs-on: macos-13
10+
build_macos_intel:
11+
runs-on: macos-15-intel
1312
# strategy:
1413
# matrix:
1514
# python: [3.11]
@@ -55,9 +54,8 @@ jobs:
5554
dotnet run
5655
5756
58-
# macos 14 is M1
59-
build_macos_14:
60-
runs-on: macos-14
57+
build_macos_arm:
58+
runs-on: macos-14 # macos-14 is arm64
6159
steps:
6260
- uses: actions/checkout@v4
6361
- name: Build HiGHS

.github/workflows/test-nuget-package.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
# macos 13 is Intel
11-
build_macos_13:
12-
runs-on: macos-13
10+
build_macos_intel:
11+
runs-on: macos-15-intel
1312
# strategy:
1413
# matrix:
1514
# python: [3.11]
@@ -56,9 +55,8 @@ jobs:
5655
5756
5857
59-
# macos 14 is M1
60-
build_macos_14:
61-
runs-on: macos-14
58+
build_macos_arm:
59+
runs-on: macos-14 # macos-14 is arm64
6260
steps:
6361
- uses: actions/checkout@v4
6462
- name: Build HiGHS

0 commit comments

Comments
 (0)