Skip to content

Commit 9027439

Browse files
authored
Revert "Replaces deprecated macos-13 runner with macos-15-intel runner"
1 parent c780f58 commit 9027439

File tree

7 files changed

+28
-22
lines changed

7 files changed

+28
-22
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-
# Build macos intel
11-
build_macos_intel:
12-
runs-on: macos-15-intel
10+
# macos 13 is Intel
11+
build_macos_13:
12+
runs-on: macos-13
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-
# Build macos arm64
36-
build_macos_arm:
37-
runs-on: macos-14 # macos-14 is arm64
35+
# macos 14 is M1
36+
build_macos_14:
37+
runs-on: macos-14
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_intel, build_macos_arm, build_windows_32, build_linux, build_linux_arm64]
129+
needs: [build_macos_13, build_macos_14, 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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,9 @@ jobs:
132132
python3 -m pip install pytest
133133
python3 -m pytest $GITHUB_WORKSPACE
134134
135-
build_wheel_macos_intel:
136-
runs-on: macos-15-intel
135+
# macos 13 is Intel
136+
build_wheel_macos_13:
137+
runs-on: macos-13
137138
strategy:
138139
matrix:
139140
python: [3.11]
@@ -162,8 +163,9 @@ jobs:
162163
python3 -m pip install pytest
163164
python3 -m pytest $GITHUB_WORKSPACE
164165
165-
build_wheel_macos_arm:
166-
runs-on: macos-14 # macos-14 is arm64
166+
# macos 14 is M1
167+
build_wheel_macos_14:
168+
runs-on: macos-14
167169
strategy:
168170
matrix:
169171
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-15-intel, macosx_x86_64]
52+
- [macos-13, 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-15-intel, macosx_x86_64]
41+
- [macos-13, 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-15-intel]
7+
runs-on: [macos-13]
88

99

1010
steps:

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

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

99
jobs:
10-
build_macos_intel:
11-
runs-on: macos-15-intel
10+
# macos 13 is Intel
11+
build_macos_13:
12+
runs-on: macos-13
1213
# strategy:
1314
# matrix:
1415
# python: [3.11]
@@ -54,8 +55,9 @@ jobs:
5455
dotnet run
5556
5657
57-
build_macos_arm:
58-
runs-on: macos-14 # macos-14 is arm64
58+
# macos 14 is M1
59+
build_macos_14:
60+
runs-on: macos-14
5961
steps:
6062
- uses: actions/checkout@v4
6163
- name: Build HiGHS

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

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

99
jobs:
10-
build_macos_intel:
11-
runs-on: macos-15-intel
10+
# macos 13 is Intel
11+
build_macos_13:
12+
runs-on: macos-13
1213
# strategy:
1314
# matrix:
1415
# python: [3.11]
@@ -55,8 +56,9 @@ jobs:
5556
5657
5758
58-
build_macos_arm:
59-
runs-on: macos-14 # macos-14 is arm64
59+
# macos 14 is M1
60+
build_macos_14:
61+
runs-on: macos-14
6062
steps:
6163
- uses: actions/checkout@v4
6264
- name: Build HiGHS

0 commit comments

Comments
 (0)