Skip to content

Commit 4d15b17

Browse files
fwesselmfwesselm
committed
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into neos4LargeBnds
2 parents 3bdff2b + 4f54ef2 commit 4d15b17

File tree

243 files changed

+19255
-3775
lines changed

Some content is hidden

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

243 files changed

+19255
-3775
lines changed

‎.bazelrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
common --noenable_bzlmod

‎.envrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
os: [macos-latest]
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- uses: bazelbuild/setup-bazelisk@v2
1616

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
os: [ubuntu-latest]
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Create Build Environment
1616
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -34,7 +34,7 @@ jobs:
3434
shell: bash
3535
# Execute tests defined by the CMake configuration.
3636
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
37-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
37+
run: ctest --parallel --timeout 300 --output-on-failure
3838

3939
release:
4040
runs-on: ${{ matrix.os }}
@@ -43,7 +43,7 @@ jobs:
4343
os: [ubuntu-latest]
4444

4545
steps:
46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747

4848
- name: Create Build Environment
4949
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -67,7 +67,7 @@ jobs:
6767
shell: bash
6868
# Execute tests defined by the CMake configuration.
6969
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
70-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C RELEASE
70+
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE
7171

7272
debug64:
7373
runs-on: ${{ matrix.os }}
@@ -76,7 +76,7 @@ jobs:
7676
os: [ubuntu-latest]
7777

7878
steps:
79-
- uses: actions/checkout@v3
79+
- uses: actions/checkout@v4
8080

8181
- name: Create Build Environment
8282
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -100,7 +100,7 @@ jobs:
100100
shell: bash
101101
# Execute tests defined by the CMake configuration.
102102
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
103-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
103+
run: ctest --parallel --timeout 300 --output-on-failure
104104

105105
release64:
106106
runs-on: ${{ matrix.os }}
@@ -109,7 +109,7 @@ jobs:
109109
os: [ubuntu-latest]
110110

111111
steps:
112-
- uses: actions/checkout@v3
112+
- uses: actions/checkout@v4
113113

114114
- name: Create Build Environment
115115
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -133,4 +133,4 @@ jobs:
133133
shell: bash
134134
# Execute tests defined by the CMake configuration.
135135
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
136-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C RELEASE
136+
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
os: [macOS-latest]
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Create Build Environment
1616
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -37,7 +37,7 @@ jobs:
3737
os: [ubuntu-latest]
3838

3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
4141

4242
- name: Create Build Environment
4343
run: cmake -E make_directory ${{runner.workspace}}/build

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

Lines changed: 134 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
os: [ubuntu-latest]
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Create Build Environment
1616
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -32,7 +32,38 @@ jobs:
3232
shell: bash
3333
# Execute tests defined by the CMake configuration.
3434
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
35-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
35+
run: ctest --parallel --timeout 300 --output-on-failure
36+
37+
debug_all_tests:
38+
runs-on: ${{ matrix.os }}
39+
strategy:
40+
matrix:
41+
os: [ubuntu-latest]
42+
43+
steps:
44+
- uses: actions/checkout@v4
45+
46+
- name: Create Build Environment
47+
run: cmake -E make_directory ${{runner.workspace}}/build
48+
49+
- name: Configure CMake All
50+
shell: bash
51+
working-directory: ${{runner.workspace}}/build
52+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON
53+
54+
- name: Build All
55+
working-directory: ${{runner.workspace}}/build
56+
shell: bash
57+
# Execute the build. You can specify a specific target with "--target <NAME>"
58+
run: |
59+
cmake --build . --parallel --config Debug
60+
61+
- name: Test All
62+
working-directory: ${{runner.workspace}}/build
63+
shell: bash
64+
# Execute tests defined by the CMake configuration.
65+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
66+
run: ctest --parallel --timeout 300 --output-on-failure -C Debug
3667

3768
release:
3869
runs-on: ${{ matrix.os }}
@@ -41,7 +72,7 @@ jobs:
4172
os: [ubuntu-latest]
4273

4374
steps:
44-
- uses: actions/checkout@v3
75+
- uses: actions/checkout@v4
4576

4677
- name: Create Build Environment
4778
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -63,7 +94,38 @@ jobs:
6394
shell: bash
6495
# Execute tests defined by the CMake configuration.
6596
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
66-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
97+
run: ctest --parallel --timeout 300 --output-on-failure -C Release
98+
99+
release_all_tests:
100+
runs-on: ${{ matrix.os }}
101+
strategy:
102+
matrix:
103+
os: [ubuntu-latest]
104+
105+
steps:
106+
- uses: actions/checkout@v4
107+
108+
- name: Create Build Environment
109+
run: cmake -E make_directory ${{runner.workspace}}/build
110+
111+
- name: Configure CMake All
112+
shell: bash
113+
working-directory: ${{runner.workspace}}/build
114+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON
115+
116+
- name: Build All
117+
working-directory: ${{runner.workspace}}/build
118+
shell: bash
119+
# Execute the build. You can specify a specific target with "--target <NAME>"
120+
run: |
121+
cmake --build . --parallel --config Release
122+
123+
- name: Test All
124+
working-directory: ${{runner.workspace}}/build
125+
shell: bash
126+
# Execute tests defined by the CMake configuration.
127+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
128+
run: ctest --parallel --timeout 300 --output-on-failure -C Release
67129

68130
debug64:
69131
runs-on: ${{ matrix.os }}
@@ -72,29 +134,60 @@ jobs:
72134
os: [ubuntu-latest]
73135

74136
steps:
75-
- uses: actions/checkout@v3
137+
- uses: actions/checkout@v4
76138

77139
- name: Create Build Environment
78140
run: cmake -E make_directory ${{runner.workspace}}/build
79141

80142
- name: Configure CMake
81143
shell: bash
82144
working-directory: ${{runner.workspace}}/build
83-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DHIGHSINT64=on -DFAST_BUILD=OFF
145+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DHIGHSINT64=on -DFAST_BUILD=OFF
84146

85147
- name: Build
86148
working-directory: ${{runner.workspace}}/build
87149
shell: bash
88150
# Execute the build. You can specify a specific target with "--target <NAME>"
89151
run: |
90-
cmake --build . --parallel --config Release
152+
cmake --build . --parallel --config Debug
91153
92154
- name: Test
93155
working-directory: ${{runner.workspace}}/build
94156
shell: bash
95157
# Execute tests defined by the CMake configuration.
96158
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
97-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
159+
run: ctest --parallel --timeout 300 --output-on-failure -C Debug
160+
161+
debug64_all_tests:
162+
runs-on: ${{ matrix.os }}
163+
strategy:
164+
matrix:
165+
os: [ubuntu-latest]
166+
167+
steps:
168+
- uses: actions/checkout@v4
169+
170+
- name: Create Build Environment
171+
run: cmake -E make_directory ${{runner.workspace}}/build
172+
173+
- name: Configure CMake All
174+
shell: bash
175+
working-directory: ${{runner.workspace}}/build
176+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON
177+
178+
- name: Build All
179+
working-directory: ${{runner.workspace}}/build
180+
shell: bash
181+
# Execute the build. You can specify a specific target with "--target <NAME>"
182+
run: |
183+
cmake --build . --parallel --config Debug
184+
185+
- name: Test All
186+
working-directory: ${{runner.workspace}}/build
187+
shell: bash
188+
# Execute tests defined by the CMake configuration.
189+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
190+
run: ctest --parallel --timeout 300 --output-on-failure -C Debug
98191

99192
Release64:
100193
runs-on: ${{ matrix.os }}
@@ -103,7 +196,7 @@ jobs:
103196
os: [ubuntu-latest]
104197

105198
steps:
106-
- uses: actions/checkout@v3
199+
- uses: actions/checkout@v4
107200

108201
- name: Create Build Environment
109202
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -125,4 +218,35 @@ jobs:
125218
shell: bash
126219
# Execute tests defined by the CMake configuration.
127220
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
128-
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
221+
run: ctest --parallel --timeout 300 --output-on-failure -C Release
222+
223+
Release64_all_tests:
224+
runs-on: ${{ matrix.os }}
225+
strategy:
226+
matrix:
227+
os: [ubuntu-latest]
228+
229+
steps:
230+
- uses: actions/checkout@v4
231+
232+
- name: Create Build Environment
233+
run: cmake -E make_directory ${{runner.workspace}}/build
234+
235+
- name: Configure CMake All
236+
shell: bash
237+
working-directory: ${{runner.workspace}}/build
238+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON
239+
240+
- name: Build All
241+
working-directory: ${{runner.workspace}}/build
242+
shell: bash
243+
# Execute the build. You can specify a specific target with "--target <NAME>"
244+
run: |
245+
cmake --build . --parallel --config Release
246+
247+
- name: Test All
248+
working-directory: ${{runner.workspace}}/build
249+
shell: bash
250+
# Execute tests defined by the CMake configuration.
251+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
252+
run: ctest --parallel --timeout 300 --output-on-failure -C Release

0 commit comments

Comments
 (0)