Skip to content

Commit 1c67683

Browse files
galabovaagalabovaa
committed
Merge branch 'latest' into pr-3072-
2 parents 54aee52 + 5d33d27 commit 1c67683

261 files changed

Lines changed: 18689 additions & 4646 deletions

File tree

Some content is hidden

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

‎.github/julia/build_tarballs.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
3333
-DCMAKE_BUILD_TYPE=Release \
3434
-DBUILD_SHARED_LIBS=${BUILD_SHARED} \
3535
-DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
36-
-DHIPO=ON \
36+
-DHIPO=ON -DBUILD_SHARED_EXTRAS_LIB=OFF \
3737
-DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
3838
..
3939

‎.github/workflows/action-sanitizers-bazel.yml‎

Lines changed: 63 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
asan:
8-
runs-on: ${{ matrix.os }}
9-
strategy:
10-
matrix:
11-
os: [ubuntu-latest]
7+
# asan:
8+
# runs-on: ${{ matrix.os }}
9+
# strategy:
10+
# matrix:
11+
# os: [ubuntu-latest]
1212

13-
steps:
14-
- uses: actions/checkout@v4
13+
# steps:
14+
# - uses: actions/checkout@v6
1515

16-
- uses: bazelbuild/setup-bazelisk@v3
16+
# - uses: bazelbuild/setup-bazelisk@v3
1717

18-
- name: Bazel clean
19-
run: bazel clean
18+
# - name: Bazel clean
19+
# run: bazel clean
2020

21-
- name: Bazel build
22-
run: bazel build -c dbg --config=asan //...
21+
# - name: Bazel build
22+
# run: bazel build -c dbg --config=asan //...
2323

24-
- name: Bazel test
25-
run: bazel test -c dbg --config=asan --runs_per_test 3000 //...
24+
# - name: Bazel test
25+
# run: bazel test -c dbg --config=asan --runs_per_test 3 //...
2626

27-
# - name: Upload bazel-testlogs
28-
# uses: actions/upload-artifact@v4
29-
# with:
30-
# name: bazel-testlogs-asan
31-
# path: bazel-testlogs/
27+
# # - name: Upload bazel-testlogs
28+
# # uses: actions/upload-artifact@v7
29+
# # with:
30+
# # name: bazel-testlogs-asan
31+
# # path: bazel-testlogs/
3232

3333
tsan:
3434
runs-on: ${{ matrix.os }}
@@ -37,7 +37,7 @@ jobs:
3737
os: [ubuntu-latest]
3838

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

4242
- uses: bazelbuild/setup-bazelisk@v3
4343

@@ -48,62 +48,65 @@ jobs:
4848
run: bazel build -c dbg --config=tsan //...
4949

5050
- name: Bazel test
51-
run: bazel test -c dbg --config=tsan --runs_per_test 3000 //...
51+
run: bazel test -c dbg --config=tsan --runs_per_test 3 //:TestMipSolver
52+
53+
- name: Bazel test 2
54+
run: bazel test -c dbg --config=tsan --runs_per_test 3 //:TestHighsParallel
5255

5356
# - name: Upload bazel-testlogs
54-
# uses: actions/upload-artifact@v4
57+
# uses: actions/upload-artifact@v7
5558
# with:
5659
# name: bazel-testlogs-tsan
5760
# path: bazel-testlogs/
5861

59-
lsan:
60-
runs-on: ${{ matrix.os }}
61-
strategy:
62-
matrix:
63-
os: [ubuntu-latest]
62+
# lsan:
63+
# runs-on: ${{ matrix.os }}
64+
# strategy:
65+
# matrix:
66+
# os: [ubuntu-latest]
6467

65-
steps:
66-
- uses: actions/checkout@v4
68+
# steps:
69+
# - uses: actions/checkout@v6
6770

68-
- uses: bazelbuild/setup-bazelisk@v3
71+
# - uses: bazelbuild/setup-bazelisk@v3
6972

70-
- name: Bazel clean
71-
run: bazel clean
73+
# - name: Bazel clean
74+
# run: bazel clean
7275

73-
- name: Bazel build
74-
run: bazel build -c dbg --config=lsan //...
76+
# - name: Bazel build
77+
# run: bazel build -c dbg --config=lsan //...
7578

76-
- name: Bazel test
77-
run: bazel test -c dbg --config=lsan --runs_per_test 3000 //...
79+
# - name: Bazel test
80+
# run: bazel test -c dbg --config=lsan --runs_per_test 3 //...
7881

79-
# - name: Upload bazel-testlogs
80-
# uses: actions/upload-artifact@v4
81-
# with:
82-
# name: bazel-testlogs-lsan
83-
# path: bazel-testlogs/
82+
# # - name: Upload bazel-testlogs
83+
# # uses: actions/upload-artifact@v7
84+
# # with:
85+
# # name: bazel-testlogs-lsan
86+
# # path: bazel-testlogs/
8487

85-
ubsan:
86-
runs-on: ${{ matrix.os }}
87-
strategy:
88-
matrix:
89-
os: [ubuntu-latest]
88+
# ubsan:
89+
# runs-on: ${{ matrix.os }}
90+
# strategy:
91+
# matrix:
92+
# os: [ubuntu-latest]
9093

91-
steps:
92-
- uses: actions/checkout@v4
94+
# steps:
95+
# - uses: actions/checkout@v6
9396

94-
- uses: bazelbuild/setup-bazelisk@v3
97+
# - uses: bazelbuild/setup-bazelisk@v3
9598

96-
- name: Bazel clean
97-
run: bazel clean
99+
# - name: Bazel clean
100+
# run: bazel clean
98101

99-
- name: Bazel build
100-
run: bazel build -c dbg --config=ubsan //...
102+
# - name: Bazel build
103+
# run: bazel build -c dbg --config=ubsan //...
101104

102-
- name: Bazel test
103-
run: bazel test -c dbg --config=ubsan --runs_per_test 3000 //...
105+
# - name: Bazel test
106+
# run: bazel test -c dbg --config=ubsan --runs_per_test 3000 //...
104107

105-
# - name: Upload bazel-testlogs
106-
# uses: actions/upload-artifact@v4
107-
# with:
108-
# name: bazel-testlogs-ubsan
109-
# path: bazel-testlogs/
108+
# # - name: Upload bazel-testlogs
109+
# # uses: actions/upload-artifact@v7
110+
# # with:
111+
# # name: bazel-testlogs-ubsan
112+
# # path: bazel-testlogs/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
os: [macos-latest, ubuntu-latest]
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

2020
- uses: bazelbuild/setup-bazelisk@v3
2121

@@ -32,7 +32,7 @@ jobs:
3232
run: ./bazel-bin/call-highs-example
3333

3434
# - name: Upload bazel-testlogs
35-
# uses: actions/upload-artifact@v4
35+
# uses: actions/upload-artifact@v7
3636
# with:
3737
# name: bazel-testlogs-${{ matrix.os }}
3838
# path: bazel-testlogs/
@@ -41,7 +41,7 @@ jobs:
4141
bazel-win_:
4242
runs-on: windows-latest
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v6
4545

4646
# Bazelisk is available via Chocolatey (on Windows)
4747
- name: Install Bazelisk

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
os: [ubuntu-latest]
1515

1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1818

1919
- name: Create Build Environment
20-
run: cmake -E make_directory ${{runner.workspace}}/build
20+
run: cmake -E make_directory ${{github.workspace}}/build
2121

2222
- name: Configure CMake
2323
shell: bash
24-
working-directory: ${{runner.workspace}}/build
24+
working-directory: ${{github.workspace}}/build
2525
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=OFF
2626

2727
- name: Build
28-
working-directory: ${{runner.workspace}}/build
28+
working-directory: ${{github.workspace}}/build
2929
shell: bash
3030
# Execute the build. You can specify a specific target with "--target <NAME>"
3131
run: |
@@ -34,7 +34,7 @@ jobs:
3434
cmake --build . --parallel --config Debug
3535
3636
- name: Test
37-
working-directory: ${{runner.workspace}}/build
37+
working-directory: ${{github.workspace}}/build
3838
shell: bash
3939
# Execute tests defined by the CMake configuration.
4040
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -47,18 +47,18 @@ jobs:
4747
os: [ubuntu-latest]
4848

4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v6
5151

5252
- name: Create Build Environment
53-
run: cmake -E make_directory ${{runner.workspace}}/build
53+
run: cmake -E make_directory ${{github.workspace}}/build
5454

5555
- name: Configure CMake
5656
shell: bash
57-
working-directory: ${{runner.workspace}}/build
57+
working-directory: ${{github.workspace}}/build
5858
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=RELEASE
5959

6060
- name: Build
61-
working-directory: ${{runner.workspace}}/build
61+
working-directory: ${{github.workspace}}/build
6262
shell: bash
6363
# Execute the build. You can specify a specific target with "--target <NAME>"
6464
run: |
@@ -67,7 +67,7 @@ jobs:
6767
cmake --build . --parallel --config RELEASE
6868
6969
- name: Test
70-
working-directory: ${{runner.workspace}}/build
70+
working-directory: ${{github.workspace}}/build
7171
shell: bash
7272
# Execute tests defined by the CMake configuration.
7373
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -80,18 +80,18 @@ jobs:
8080
os: [ubuntu-latest]
8181

8282
steps:
83-
- uses: actions/checkout@v4
83+
- uses: actions/checkout@v6
8484

8585
- name: Create Build Environment
86-
run: cmake -E make_directory ${{runner.workspace}}/build
86+
run: cmake -E make_directory ${{github.workspace}}/build
8787

8888
- name: Configure CMake
8989
shell: bash
90-
working-directory: ${{runner.workspace}}/build
90+
working-directory: ${{github.workspace}}/build
9191
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=OFF -DHIGHSINT64=on
9292

9393
- name: Build
94-
working-directory: ${{runner.workspace}}/build
94+
working-directory: ${{github.workspace}}/build
9595
shell: bash
9696
# Execute the build. You can specify a specific target with "--target <NAME>"
9797
run: |
@@ -100,7 +100,7 @@ jobs:
100100
cmake --build . --parallel --config Debug
101101
102102
- name: Test
103-
working-directory: ${{runner.workspace}}/build
103+
working-directory: ${{github.workspace}}/build
104104
shell: bash
105105
# Execute tests defined by the CMake configuration.
106106
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -113,18 +113,18 @@ jobs:
113113
os: [ubuntu-latest]
114114

115115
steps:
116-
- uses: actions/checkout@v4
116+
- uses: actions/checkout@v6
117117

118118
- name: Create Build Environment
119-
run: cmake -E make_directory ${{runner.workspace}}/build
119+
run: cmake -E make_directory ${{github.workspace}}/build
120120

121121
- name: Configure CMake
122122
shell: bash
123-
working-directory: ${{runner.workspace}}/build
123+
working-directory: ${{github.workspace}}/build
124124
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=RELEASE -DHIGHSINT64=on
125125

126126
- name: Build
127-
working-directory: ${{runner.workspace}}/build
127+
working-directory: ${{github.workspace}}/build
128128
shell: bash
129129
# Execute the build. You can specify a specific target with "--target <NAME>"
130130
run: |
@@ -133,7 +133,7 @@ jobs:
133133
cmake --build . --parallel --config RELEASE
134134
135135
- name: Test
136-
working-directory: ${{runner.workspace}}/build
136+
working-directory: ${{github.workspace}}/build
137137
shell: bash
138138
# Execute tests defined by the CMake configuration.
139139
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ jobs:
1414
os: [macOS-latest]
1515

1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1818

1919
- name: Create Build Environment
20-
run: cmake -E make_directory ${{runner.workspace}}/build
20+
run: cmake -E make_directory ${{github.workspace}}/build
2121

2222
- name: Configure CMake
2323
shell: bash
24-
working-directory: ${{runner.workspace}}/build
24+
working-directory: ${{github.workspace}}/build
2525
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON
2626

2727
- name: Build
28-
working-directory: ${{runner.workspace}}/build
28+
working-directory: ${{github.workspace}}/build
2929
shell: bash
3030
run: cmake --build . --parallel
3131

3232
- name: Test
33-
working-directory: ${{runner.workspace}}/build
33+
working-directory: ${{github.workspace}}/build
3434
shell: bash
3535
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE
3636

@@ -41,24 +41,24 @@ jobs:
4141
os: [ubuntu-latest]
4242

4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v6
4545

4646
- name: Create Build Environment
47-
run: cmake -E make_directory ${{runner.workspace}}/build
47+
run: cmake -E make_directory ${{github.workspace}}/build
4848

4949
- name: Configure CMake
5050
shell: bash
51-
working-directory: ${{runner.workspace}}/build
51+
working-directory: ${{github.workspace}}/build
5252
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_UNITY_BUILD=ON
5353

5454
- name: Build
55-
working-directory: ${{runner.workspace}}/build
55+
working-directory: ${{github.workspace}}/build
5656
shell: bash
5757
# Execute the build. You can specify a specific target with "--target <NAME>"
5858
run: cmake --build . --parallel
5959

6060
- name: Test
61-
working-directory: ${{runner.workspace}}/build
61+
working-directory: ${{github.workspace}}/build
6262
shell: bash
6363
# Execute tests defined by the CMake configuration.
6464
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v6
1414

1515
- name: Add oneAPI to apt
1616
shell: bash

0 commit comments

Comments
 (0)