Skip to content

Commit 112ce96

Browse files
galabovaagalabovaa
committed
merge latest
2 parents aa55681 + ecaf609 commit 112ce96

File tree

195 files changed

+7417
-3793
lines changed

Some content is hidden

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

195 files changed

+7417
-3793
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Configure CMake
1919
shell: bash
2020
working-directory: ${{runner.workspace}}/build
21-
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
21+
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON
2222

2323
- name: Build
2424
working-directory: ${{runner.workspace}}/build
@@ -45,7 +45,7 @@ jobs:
4545
- name: Configure CMake
4646
shell: bash
4747
working-directory: ${{runner.workspace}}/build
48-
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG
48+
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_UNITY_BUILD=ON
4949

5050
- name: Build
5151
working-directory: ${{runner.workspace}}/build

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ jobs:
4747
source /opt/intel/oneapi/setvars.sh
4848
cmake --build build --parallel
4949
50+
# If the unit tests below are failing run to see details.
51+
# - name: Unit Test
52+
# shell: bash
53+
# run: |
54+
# source /opt/intel/oneapi/setvars.sh
55+
# export SYCL_DEVICE_FILTER=opencl.cpu
56+
# pwd
57+
# ls
58+
# ls build
59+
# ls build/bin
60+
# ./build/bin/unit_tests
61+
5062
- name: Test
5163
shell: bash
5264
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187

188188
- name: Dotnet pack
189189
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
190-
run: dotnet pack -c Release /p:Version=1.10.0
190+
run: dotnet pack -c Release /p:Version=1.11.0
191191

192192
- uses: actions/upload-artifact@v4
193193
with:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
python3 -m pytest $GITHUB_WORKSPACE
5050
5151
build_sdist_win:
52-
runs-on: windows-2019
52+
runs-on: windows-2022
5353
steps:
5454
- uses: actions/checkout@v4
5555

@@ -195,7 +195,7 @@ jobs:
195195
python3 -m pytest $GITHUB_WORKSPACE
196196
197197
build_wheel_windows:
198-
runs-on: windows-2019
198+
runs-on: windows-2022
199199
steps:
200200
- uses: actions/checkout@v4
201201

@@ -222,7 +222,7 @@ jobs:
222222
python -m pytest
223223
224224
build_wheel_windows_313:
225-
runs-on: windows-2019
225+
runs-on: windows-2022
226226
steps:
227227
- uses: actions/checkout@v4
228228

‎.github/workflows/build-unit-tests-external.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
run: ctest --parallel --timeout 300 --output-on-failure
8383

8484
# release__windows_extra_unit_tests:
85-
# runs-on: windows-2019
85+
# runs-on: windows-2022
8686

8787
# steps:
8888
# - uses: actions/checkout@v4
@@ -118,7 +118,7 @@ jobs:
118118
# - name: Unit Test Extra
119119
# working-directory: ${{runner.workspace}}/build
120120
# shell: bash
121-
# run: ./bin/Release/unit_tests.exe highs-names-extra
121+
# run: ./Release/bin/unit_tests.exe highs-names-extra
122122

123123
# - name: Test
124124
# working-directory: ${{runner.workspace}}/build

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151
- [ubuntu-24.04-arm, musllinux_aarch64]
5252
- [macos-13, macosx_x86_64]
5353
- [macos-14, macosx_arm64]
54-
- [windows-2019, win_amd64]
55-
- [windows-2019, win32]
54+
- [windows-2022, win_amd64]
55+
- [windows-2022, win32]
5656
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
5757

5858
steps:
5959
- uses: actions/checkout@v4
6060

6161
- name: Build wheels
62-
uses: pypa/cibuildwheel@v2.21
62+
uses: pypa/cibuildwheel@v3.0
6363
env:
6464
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
6565

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

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

3-
on: [push]
4-
# on: [pull_request]
3+
# on: [push]
4+
on: [pull_request]
55

66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
@@ -40,13 +40,13 @@ jobs:
4040
- [ubuntu-24.04-arm, musllinux_aarch64]
4141
- [macos-13, macosx_x86_64]
4242
- [macos-14, macosx_arm64]
43-
- [windows-2019, win_amd64]
44-
- [windows-2019, win32]
43+
- [windows-2022, win_amd64]
44+
- [windows-2022, win32]
4545
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
4646

4747
steps:
4848
- uses: actions/checkout@v4
4949
- name: Build wheels
50-
uses: pypa/cibuildwheel@v2.21
50+
uses: pypa/cibuildwheel@v3.0
5151
env:
5252
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

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

Lines changed: 6 additions & 6 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-2019
7+
runs-on: windows-2022
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-2019
46+
runs-on: windows-2022
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-2019
82+
runs-on: windows-2022
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-2019
214+
runs-on: windows-2022
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-2019
248+
runs-on: windows-2022
249249

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

281281

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

285285
steps:
286286
- uses: actions/checkout@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: ctest --timeout 300 --output-on-failure -C Release
2929

3030
release_all_tests:
31-
runs-on: windows-2019
31+
runs-on: windows-2022
3232

3333
steps:
3434
- uses: actions/checkout@v4

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: sanitizers-bazel
22

3-
on: [push, pull_request]
3+
#on: [push, pull_request]
4+
on: []
45

56
jobs:
67
asan:
@@ -105,4 +106,4 @@ jobs:
105106
uses: actions/upload-artifact@v4
106107
with:
107108
name: bazel-testlogs-ubsan
108-
path: bazel-testlogs/
109+
path: bazel-testlogs/

0 commit comments

Comments
 (0)