Skip to content

Commit 1b42c30

Browse files
author
Julian Hall
committed
Merged latest into this branch and cleared minor conflicts
2 parents dd36573 + b174cc9 commit 1b42c30

File tree

193 files changed

+4843
-6512
lines changed

Some content is hidden

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

193 files changed

+4843
-6512
lines changed

‎.github/julia/build_tarballs.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ build_tarballs(
7575
platforms,
7676
products,
7777
dependencies;
78-
preferred_gcc_version = v"6",
78+
preferred_gcc_version = v"11",
7979
julia_compat = "1.6",
8080
)

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

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ jobs:
66
bazel:
77
runs-on: ${{ matrix.os }}
88
strategy:
9+
fail-fast: false
910
matrix:
10-
os: [macos-latest]
11+
os: [macos-latest, ubuntu-latest]
1112

1213
steps:
1314
- uses: actions/checkout@v4
@@ -16,18 +17,39 @@ jobs:
1617

1718
- name: bazel clean
1819
run: bazel clean
19-
20+
2021
- name: build bazel
2122
run: bazel build //...
22-
23+
2324
- name: test all
2425
run: bazel test --test_output=all //...
2526

2627
- name: test example
2728
run: ./bazel-bin/call-highs-example
2829

29-
- name: Upload bazel-testlogs
30-
uses: actions/upload-artifact@v4
31-
with:
32-
name: bazel-testlogs
33-
path: bazel-testlogs/
30+
# - name: Upload bazel-testlogs
31+
# uses: actions/upload-artifact@v4
32+
# with:
33+
# name: bazel-testlogs-${{ matrix.os }}
34+
# path: bazel-testlogs/
35+
36+
37+
bazel-win_:
38+
runs-on: windows-latest
39+
steps:
40+
- uses: actions/checkout@v4
41+
42+
# Bazelisk is available via Chocolatey (on Windows)
43+
- name: Install Bazelisk
44+
run: |
45+
choco install bazelisk --yes
46+
bazelisk version
47+
48+
- name: Build with Bazelisk
49+
run: bazelisk build //...
50+
51+
- name: Run tests with Bazelisk
52+
run: bazelisk test --test_output=all //...
53+
54+
- name: test example
55+
run: ./bazel-bin/call-highs-example.exe

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build-macos
22

3-
on: [push, pull_request]
3+
on: [pull_request]
44

55
jobs:
66
debug:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build-nuget-package
22

3-
on: [push, pull_request]
3+
on: [pull_request]
44

55
concurrency:
66
group: ${{ github.workflow }}-${{ github.ref }}
@@ -184,7 +184,7 @@ jobs:
184184

185185
- name: Dotnet pack
186186
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
187-
run: dotnet pack -c Release /p:Version=1.12.0
187+
run: dotnet pack -c Release /p:Version=1.13.1
188188

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

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Build sdist
1717
run: |
18-
python3 -m pip install build
18+
python3 -m pip install build
1919
python3 -m build --sdist
2020
2121
- name: Install sdist
@@ -27,7 +27,7 @@ jobs:
2727
run: |
2828
python3 -m pip install pytest
2929
python3 -m pytest $GITHUB_WORKSPACE
30-
30+
3131
build_sdist_mac:
3232
runs-on: macos-latest
3333
steps:
@@ -72,13 +72,14 @@ jobs:
7272
- name: Test highspy
7373
run: |
7474
python -m pip install pytest
75-
python -m pytest
76-
75+
python -m pytest
76+
7777
build_wheel_linux:
7878
runs-on: ubuntu-24.04
7979
strategy:
8080
matrix:
81-
python: [3.11]
81+
python: [3.14]
82+
8283
steps:
8384
- uses: actions/checkout@v4
8485

@@ -91,7 +92,7 @@ jobs:
9192
run: |
9293
python3 --version
9394
python3 -m pip install cibuildwheel
94-
python3 -m cibuildwheel --only cp311-manylinux_x86_64 $GITHUB_WORKSPACE
95+
python3 -m cibuildwheel --only cp314-manylinux_x86_64 $GITHUB_WORKSPACE
9596
9697
- name: Install wheel
9798
run: |
@@ -136,7 +137,7 @@ jobs:
136137
runs-on: macos-15-intel
137138
strategy:
138139
matrix:
139-
python: [3.11]
140+
python: [3.11]
140141
steps:
141142
- uses: actions/checkout@v4
142143

@@ -161,12 +162,12 @@ jobs:
161162
run: |
162163
python3 -m pip install pytest
163164
python3 -m pytest $GITHUB_WORKSPACE
164-
165+
165166
build_wheel_macos_arm:
166167
runs-on: macos-14 # macos-14 is arm64
167168
strategy:
168169
matrix:
169-
python: [3.11]
170+
python: [3.11]
170171
steps:
171172
- uses: actions/checkout@v4
172173

@@ -200,12 +201,12 @@ jobs:
200201
- name: Install correct python version
201202
uses: actions/setup-python@v5
202203
with:
203-
python-version: 3.9
204+
python-version: 3.14
204205

205206
- name: Build wheel
206207
run: |
207208
python -m pip install cibuildwheel
208-
python -m cibuildwheel --only cp39-win_amd64 $GITHUB_WORKSPACE
209+
python -m cibuildwheel --only cp314-win_amd64 $GITHUB_WORKSPACE
209210
210211
- name: Install wheel
211212
run: |
@@ -217,8 +218,8 @@ jobs:
217218
- name: Test highspy
218219
run: |
219220
python -m pip install pytest
220-
python -m pytest
221-
221+
python -m pytest
222+
222223
build_wheel_windows_313:
223224
runs-on: windows-2022
224225
steps:
@@ -244,5 +245,4 @@ jobs:
244245
- name: Test highspy
245246
run: |
246247
python -m pip install pytest
247-
python -m pytest
248-
248+
python -m pytest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build-python-sdist
22

3-
on: [push, pull_request]
3+
on: [pull_request]
44

55
jobs:
66
build_sdist_ubuntu:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ jobs:
5353
- [macos-14, macosx_arm64]
5454
- [windows-2022, win_amd64]
5555
- [windows-2022, win32]
56-
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
56+
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313", "cp314"]
5757

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242
- [macos-14, macosx_arm64]
4343
- [windows-2022, win_amd64]
4444
- [windows-2022, win32]
45-
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
45+
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313", "cp314"]
4646

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: cmake-macos-cpp
22

3-
on: [push, pull_request]
3+
on: [pull_request]
44

55
jobs:
66
release:

‎.github/workflows/code-coverage.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,35 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- name: install
16-
run: sudo apt-get update && sudo apt-get install lcov
15+
- name: install
16+
run: sudo apt-get update && sudo apt-get install lcov
1717

1818
- name: Create Build Environment
1919
run: cmake -E make_directory ${{runner.workspace}}/build
2020

2121
- name: Configure CMake
2222
shell: bash
2323
working-directory: ${{runner.workspace}}/build
24-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DHIGHS_COVERAGE=ON -DALL_TESTS=ON -DBUILD_SHARED_LIBS=OFF -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++
24+
run: |
25+
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug \
26+
-DHIGHS_COVERAGE=ON \
27+
-DALL_TESTS=ON \
28+
-DBUILD_SHARED_LIBS=OFF \
29+
-D CMAKE_C_COMPILER=gcc \
30+
-D CMAKE_CXX_COMPILER=g++
2531
2632
- name: Build
2733
working-directory: ${{runner.workspace}}/build
2834
shell: bash
2935
run: |
30-
cmake --build . --parallel --config Debug
36+
cmake --build . -j2
3137
3238
- name: Test
3339
working-directory: ${{runner.workspace}}/build
3440
shell: bash
35-
run: ctest --parallel --timeout 300 --output-on-failure
41+
run: ctest --parallel --timeout 300 --output-on-failure
3642

43+
# Coverage with HiPO will be different
3744
- name: Generate Report
3845
working-directory: ${{runner.workspace}}/build
3946
shell: bash
@@ -44,19 +51,19 @@ jobs:
4451
lcov --remove cov.info "extern/pdqsort/*" -o cov.info
4552
lcov --remove cov.info "extern/zstr/*" -o cov.info
4653
lcov --remove cov.info "extern/catch*" -o cov.info
47-
lcov --remove cov.info "app/CLI11*" -o cov.info
54+
lcov --remove cov.info "extern/CLI11*" -o cov.info
4855
lcov --remove cov.info "highs/test_kkt*" -o cov.info
4956
lcov --list cov.info
5057
mv cov.info coverage.info
5158
52-
- name: Genhtml Results Summary
59+
- name: Genhtml Results Summary
5360
working-directory: ${{runner.workspace}}/build
5461
shell: bash
5562
run: |
5663
genhtml -o coverage coverage.info
5764
58-
# Made it past the first token issue.
59-
# May need some more time to porpagate on the codecov side.
65+
# Made it past the first token issue.
66+
# May need some more time to porpagate on the codecov side.
6067
- name: Upload coverage reports to Codecov
6168
uses: codecov/codecov-action@v5
6269
with:

0 commit comments

Comments
 (0)