Skip to content

Commit 861b7c2

Browse files
committed
Merge branch 'extra-tests' of https://github.com/ERGO-Code/HiGHS into extra-tests
2 parents 4cc4b74 + 61b3ca0 commit 861b7c2

File tree

131 files changed

+7981
-3232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+7981
-3232
lines changed

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

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

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

35-
# macos 14 is M1 (beta)
35+
# macos 14 is M1
3636
build_macos_14:
3737
runs-on: macos-14
3838
steps:
@@ -124,7 +124,7 @@ jobs:
124124

125125
build_windows:
126126
runs-on: windows-latest
127-
needs: [build_macos_12, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
127+
needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
128128
steps:
129129
- uses: actions/checkout@v4
130130
- name: Build HiGHS Windows native
@@ -185,7 +185,7 @@ jobs:
185185

186186
- name: Dotnet pack
187187
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
188-
run: dotnet pack -c Release /p:Version=1.7.2
188+
run: dotnet pack -c Release /p:Version=1.8.0
189189

190190
- uses: actions/upload-artifact@v4
191191
with:

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

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,12 @@ jobs:
105105
python3 -m pip install pytest
106106
python3 -m pytest $GITHUB_WORKSPACE
107107
108-
109-
# macos 12 is Intel
110-
build_wheel_macos_12:
111-
runs-on: macos-12
108+
# macos 13 is Intel
109+
build_wheel_macos_13:
110+
runs-on: macos-13
112111
strategy:
113112
matrix:
114-
python: [3.11]
113+
python: [3.11]
115114
steps:
116115
- uses: actions/checkout@v4
117116

@@ -134,12 +133,12 @@ jobs:
134133
135134
- name: Test highspy
136135
run: |
137-
python3 -m pip install pytest
136+
python3 -m pip install pytest
138137
python3 -m pytest $GITHUB_WORKSPACE
139138
140-
# macos 13 is Intel
141-
build_wheel_macos_13:
142-
runs-on: macos-13
139+
# macos 14 is M1
140+
build_wheel_macos_14:
141+
runs-on: macos-14
143142
strategy:
144143
matrix:
145144
python: [3.11]
@@ -154,7 +153,7 @@ jobs:
154153
- name: Build wheel
155154
run: |
156155
python3 -m pip install cibuildwheel
157-
python3 -m cibuildwheel --only cp311-macosx_x86_64 $GITHUB_WORKSPACE
156+
python3 -m cibuildwheel --only cp311-macosx_arm64 $GITHUB_WORKSPACE
158157
159158
- name: Install wheel
160159
run: |
@@ -167,38 +166,34 @@ jobs:
167166
run: |
168167
python3 -m pip install pytest
169168
python3 -m pytest $GITHUB_WORKSPACE
170-
171-
# macos 14 is M1 (beta)
172-
build_wheel_macos_14:
173-
runs-on: macos-14
174-
strategy:
175-
matrix:
176-
python: [3.11]
169+
170+
build_wheel_windows:
171+
runs-on: windows-2019
177172
steps:
178173
- uses: actions/checkout@v4
179174

180175
- name: Install correct python version
181176
uses: actions/setup-python@v5
182177
with:
183-
python-version: ${{ matrix.python }}
178+
python-version: 3.9
184179

185180
- name: Build wheel
186181
run: |
187-
python3 -m pip install cibuildwheel
188-
python3 -m cibuildwheel --only cp311-macosx_arm64 $GITHUB_WORKSPACE
182+
python -m pip install cibuildwheel
183+
python -m cibuildwheel --only cp39-win_amd64 $GITHUB_WORKSPACE
189184
190185
- name: Install wheel
191186
run: |
192187
ls wheelhouse
193-
python3 --version
194-
python3 -m pip install wheelhouse/*.whl
195-
python3 -c "import highspy; print(dir(highspy))"
188+
$item = Get-ChildItem wheelhouse
189+
python -m pip install "$item"
190+
python -c "import highspy; print(dir(highspy))"
196191
197192
- name: Test highspy
198193
run: |
199-
python3 -m pip install pytest
200-
python3 -m pytest $GITHUB_WORKSPACE
201-
194+
python -m pip install pytest
195+
python -m pytest
196+
202197
build_wheel_windows:
203198
runs-on: windows-2019
204199
steps:
@@ -207,12 +202,12 @@ jobs:
207202
- name: Install correct python version
208203
uses: actions/setup-python@v5
209204
with:
210-
python-version: 3.9
205+
python-version: 3.13
211206

212207
- name: Build wheel
213208
run: |
214209
python -m pip install cibuildwheel
215-
python -m cibuildwheel --only cp39-win_amd64 $GITHUB_WORKSPACE
210+
python -m cibuildwheel --only cp313-win_amd64 $GITHUB_WORKSPACE
216211
217212
- name: Install wheel
218213
run: |

0 commit comments

Comments
 (0)