Skip to content

Commit 0ae7aa0

Browse files
fwesselmfwesselm
committed
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into neos4LargeBnds
2 parents 2ab17c5 + 7689da7 commit 0ae7aa0

Some content is hidden

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

50 files changed

+1069
-616
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.0
188+
run: dotnet pack -c Release /p:Version=1.7.1
189189

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
python3 -m pytest $GITHUB_WORKSPACE
4949
5050
build_sdist_win:
51-
runs-on: windows-latest
51+
runs-on: windows-2019
5252
steps:
5353
- uses: actions/checkout@v4
5454

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
- uses: actions/checkout@v4
3939
- name: Build wheels
40-
uses: pypa/cibuildwheel@v2.17
40+
uses: pypa/cibuildwheel@v2.18.1
4141
env:
4242
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
4343
- uses: actions/upload-artifact@v3

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: build-wheels
22

33
on: [push]
4+
# on: [pull_request]
45

56
concurrency:
67
group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,7 +32,7 @@ jobs:
3132
steps:
3233
- uses: actions/checkout@v4
3334
- name: Build wheels
34-
uses: pypa/cibuildwheel@v2.17
35+
uses: pypa/cibuildwheel@v2.18.1
3536
env:
3637
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
3738

‎.github/workflows/build-windows.yml‎

Lines changed: 7 additions & 7 deletions
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: windows-latest
7+
runs-on: windows-2019
88

99
steps:
1010
- uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
4343
run: cmake $GITHUB_WORKSPACE -DALL_TESTS=ON
4444

4545
fast_build_release_all_tests:
46-
runs-on: windows-latest
46+
runs-on: windows-2019
4747

4848
steps:
4949
- uses: actions/checkout@v4
@@ -79,7 +79,7 @@ jobs:
7979
run: cmake --install .
8080

8181
windows_release_fb_off:
82-
runs-on: windows-latest
82+
runs-on: windows-2019
8383

8484
steps:
8585
- uses: actions/checkout@v4
@@ -211,7 +211,7 @@ jobs:
211211
run: ctest --parallel --timeout 300 --output-on-failure -C Debug
212212

213213
windows_release64:
214-
runs-on: windows-latest
214+
runs-on: windows-2019
215215

216216
steps:
217217
- uses: actions/checkout@v4
@@ -245,7 +245,7 @@ jobs:
245245
run: ctest --timeout 300 --output-on-failure -C Release
246246

247247
windows_release64_all_tests:
248-
runs-on: windows-latest
248+
runs-on: windows-2019
249249

250250
steps:
251251
- uses: actions/checkout@v4
@@ -280,7 +280,7 @@ jobs:
280280

281281

282282
windows_release64_fb_off:
283-
runs-on: windows-latest
283+
runs-on: windows-2019
284284

285285
steps:
286286
- uses: actions/checkout@v4
@@ -413,4 +413,4 @@ jobs:
413413
shell: bash
414414
# Execute tests defined by the CMake configuration.
415415
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
416-
run: ctest --output-on-failure -C Debug
416+
run: ctest --output-on-failure -C Debug

‎.github/workflows/cmake-linux-cpp.yml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: cmake-linux-cpp
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
release:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
matrix:
10+
os: [ubuntu-latest]
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Create Build Environment
16+
run: cmake -E make_directory ${{runner.workspace}}/build
17+
18+
- name: Configure CMake
19+
working-directory: ${{runner.workspace}}/build
20+
run: cmake $GITHUB_WORKSPACE
21+
22+
- name: Build
23+
working-directory: ${{runner.workspace}}/build
24+
run: cmake --build . --parallel
25+
26+
- name: Test
27+
working-directory: ${{runner.workspace}}/build
28+
run: ctest --parallel --timeout 300 --output-on-failure
29+
30+
release_all_tests:
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
os: [ubuntu-latest]
35+
36+
steps:
37+
- uses: actions/checkout@v4
38+
39+
- name: Create Build Environment
40+
run: cmake -E make_directory ${{runner.workspace}}/build
41+
42+
- name: Configure CMake All
43+
working-directory: ${{runner.workspace}}/build
44+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DALL_TESTS=ON
45+
46+
- name: Build All
47+
working-directory: ${{runner.workspace}}/build
48+
run: cmake --build . --parallel
49+
50+
- name: Test All
51+
working-directory: ${{runner.workspace}}/build
52+
run: ctest --parallel --timeout 300 --output-on-failure
53+
54+
debug:
55+
runs-on: ${{ matrix.os }}
56+
strategy:
57+
matrix:
58+
os: [ubuntu-latest]
59+
60+
steps:
61+
- uses: actions/checkout@v4
62+
63+
- name: Create Build Environment
64+
run: cmake -E make_directory ${{runner.workspace}}/build
65+
66+
- name: Configure CMake
67+
working-directory: ${{runner.workspace}}/build
68+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug
69+
70+
- name: Build
71+
working-directory: ${{runner.workspace}}/build
72+
shell: bash
73+
run: cmake --build . --parallel
74+
75+
- name: Test
76+
working-directory: ${{runner.workspace}}/build
77+
run: ctest --parallel --timeout 300 --output-on-failure
78+
79+
debug_all_tests:
80+
runs-on: ${{ matrix.os }}
81+
strategy:
82+
matrix:
83+
os: [ubuntu-latest]
84+
85+
steps:
86+
- uses: actions/checkout@v4
87+
88+
- name: Create Build Environment
89+
run: cmake -E make_directory ${{runner.workspace}}/build
90+
91+
- name: Configure CMake All
92+
working-directory: ${{runner.workspace}}/build
93+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DALL_TESTS=ON
94+
95+
- name: Build All
96+
working-directory: ${{runner.workspace}}/build
97+
run: cmake --build . --parallel
98+
99+
- name: Test All
100+
working-directory: ${{runner.workspace}}/build
101+
run: ctest --parallel --timeout 300 --output-on-failure

‎.github/workflows/cmake-macos-cpp.yml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: cmake-macos-cpp
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
release:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
matrix:
10+
os: [macos-latest]
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Create Build Environment
16+
run: cmake -E make_directory ${{runner.workspace}}/build
17+
18+
- name: Configure CMake
19+
working-directory: ${{runner.workspace}}/build
20+
run: cmake $GITHUB_WORKSPACE
21+
22+
- name: Build
23+
working-directory: ${{runner.workspace}}/build
24+
run: cmake --build . --parallel
25+
26+
- name: Test
27+
working-directory: ${{runner.workspace}}/build
28+
run: ctest --parallel --timeout 300 --output-on-failure
29+
30+
release_all_tests:
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
os: [macos-latest]
35+
36+
steps:
37+
- uses: actions/checkout@v4
38+
39+
- name: Create Build Environment
40+
run: cmake -E make_directory ${{runner.workspace}}/build
41+
42+
- name: Configure CMake All
43+
working-directory: ${{runner.workspace}}/build
44+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DALL_TESTS=ON
45+
46+
- name: Build All
47+
working-directory: ${{runner.workspace}}/build
48+
run: cmake --build . --parallel
49+
50+
- name: Test All
51+
working-directory: ${{runner.workspace}}/build
52+
run: ctest --parallel --timeout 300 --output-on-failure
53+
54+
debug:
55+
runs-on: ${{ matrix.os }}
56+
strategy:
57+
matrix:
58+
os: [macos-latest]
59+
60+
steps:
61+
- uses: actions/checkout@v4
62+
63+
- name: Create Build Environment
64+
run: cmake -E make_directory ${{runner.workspace}}/build
65+
66+
- name: Configure CMake
67+
working-directory: ${{runner.workspace}}/build
68+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug
69+
70+
- name: Build
71+
working-directory: ${{runner.workspace}}/build
72+
shell: bash
73+
run: cmake --build . --parallel
74+
75+
- name: Test
76+
working-directory: ${{runner.workspace}}/build
77+
run: ctest --parallel --timeout 300 --output-on-failure
78+
79+
debug_all_tests:
80+
runs-on: ${{ matrix.os }}
81+
strategy:
82+
matrix:
83+
os: [macos-latest]
84+
85+
steps:
86+
- uses: actions/checkout@v4
87+
88+
- name: Create Build Environment
89+
run: cmake -E make_directory ${{runner.workspace}}/build
90+
91+
- name: Configure CMake All
92+
working-directory: ${{runner.workspace}}/build
93+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DALL_TESTS=ON
94+
95+
- name: Build All
96+
working-directory: ${{runner.workspace}}/build
97+
run: cmake --build . --parallel
98+
99+
- name: Test All
100+
working-directory: ${{runner.workspace}}/build
101+
run: ctest --parallel --timeout 300 --output-on-failure

0 commit comments

Comments
 (0)