Skip to content

Commit 50670fd

Browse files
galabovaagalabovaa
authored
Merge pull request #1651 from ERGO-Code/latest
Merge latest for release
2 parents dd4a9a2 + 8dd3fbb commit 50670fd

File tree

356 files changed

+18120
-10632
lines changed

Some content is hidden

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

356 files changed

+18120
-10632
lines changed

‎.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: 6 additions & 6 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 2 --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
@@ -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 2 --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

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

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

1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: actions/setup-python@v2
13+
- uses: actions/checkout@v4
1514

1615
- name: Create Build Environment
1716
run: cmake -E make_directory ${{runner.workspace}}/build
1817

1918
- name: Configure CMake
2019
shell: bash
2120
working-directory: ${{runner.workspace}}/build
22-
run: cmake -DFAST_BUILD=ON -DEXP=ON $GITHUB_WORKSPACE
21+
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
2322

2423
- name: Build
2524
working-directory: ${{runner.workspace}}/build
@@ -29,21 +28,7 @@ jobs:
2928
- name: Test
3029
working-directory: ${{runner.workspace}}/build
3130
shell: bash
32-
run: ctest
33-
34-
# disable for now, py11 changes broke it. something trivial but
35-
# not necessary, that was proof of concept. leaving here for now.
36-
# - name: Doctest
37-
# working-directory: ${{runner.workspace}}/build
38-
# shell: bash
39-
# run: ./bin/doctest
40-
41-
- name: Install
42-
run: |
43-
cmake -E make_directory ${{runner.workspace}}/install \
44-
cmake -DFAST_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install $GITHUB_WORKSPACE \
45-
cmake --build . --parallel \
46-
cmake --install . \
31+
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE
4732

4833
fast-build-debug:
4934
runs-on: ${{ matrix.os }}
@@ -52,7 +37,7 @@ jobs:
5237
os: [ubuntu-latest]
5338

5439
steps:
55-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
5641

5742
- name: Create Build Environment
5843
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -66,7 +51,7 @@ jobs:
6651
working-directory: ${{runner.workspace}}/build
6752
shell: bash
6853
# Execute the build. You can specify a specific target with "--target <NAME>"
69-
run: cmake --build . --parallel --config DEBUG
54+
run: cmake --build . --parallel
7055

7156
- name: Test
7257
working-directory: ${{runner.workspace}}/build

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

Lines changed: 5 additions & 5 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,7 @@ 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 2 --timeout 300 --output-on-failure
3636

3737
release:
3838
runs-on: ${{ matrix.os }}
@@ -41,7 +41,7 @@ jobs:
4141
os: [ubuntu-latest]
4242

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

4646
- name: Create Build Environment
4747
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -72,7 +72,7 @@ jobs:
7272
os: [ubuntu-latest]
7373

7474
steps:
75-
- uses: actions/checkout@v3
75+
- uses: actions/checkout@v4
7676

7777
- name: Create Build Environment
7878
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -103,7 +103,7 @@ jobs:
103103
os: [ubuntu-latest]
104104

105105
steps:
106-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
107107

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

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

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

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

55
jobs:
66
debug:
@@ -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
@@ -32,7 +32,7 @@ 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 2 --timeout 300 --output-on-failure
3636

3737
release:
3838
runs-on: ${{ matrix.os }}
@@ -41,7 +41,7 @@ jobs:
4141
os: [macos-latest]
4242

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

4646
- name: Create Build Environment
4747
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -72,7 +72,7 @@ jobs:
7272
os: [macos-latest]
7373

7474
steps:
75-
- uses: actions/checkout@v3
75+
- uses: actions/checkout@v4
7676

7777
- name: Create Build Environment
7878
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -103,7 +103,7 @@ jobs:
103103
os: [macos-latest]
104104

105105
steps:
106-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
107107

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

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Meson Builds with Conda
1+
name: build-meson
22
on: [push, pull_request]
33

44
jobs:
@@ -8,7 +8,7 @@ jobs:
88
matrix:
99
os: [ubuntu-latest, macos-latest] # windows-latest takes to long
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
submodules: "recursive"
1414
fetch-depth: 0
@@ -33,11 +33,15 @@ jobs:
3333
run: |
3434
meson setup bbdir -Duse_zlib=enabled -Dwith_tests=True
3535
meson test -C bbdir
36-
- name: Test compiled highspy
37-
shell: bash -l {0}
38-
run: |
39-
meson configure bbdir -Dwith_pybind11=True
40-
meson compile -C bbdir
41-
LD_LIBRARY_PATH=$(pwd)/bbdir/src \
42-
PYTHONPATH=$(pwd)/bbdir \
43-
python examples/call_highs_from_python.py
36+
37+
# highspy no longer compiled with meson, back to
38+
# setuptools and CMakeBuild
39+
# todo: use it optionally in some way
40+
# - name: Test compiled highspy
41+
# shell: bash -l {0}
42+
# run: |
43+
# meson configure bbdir -Dwith_pybind11=True
44+
# meson compile -C bbdir
45+
# LD_LIBRARY_PATH=$(pwd)/bbdir/src \
46+
# PYTHONPATH=$(pwd)/bbdir \
47+
# python examples/call_highs_from_python.py

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

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

3+
# on: [push, pull_request]
34
on: [pull_request]
45

56
jobs:
@@ -41,12 +42,12 @@ jobs:
4142
${{ matrix.target-prefix }}-cc
4243
${{ matrix.target-prefix }}-ninja
4344
44-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v4
4546

4647
- name: Configure CMake
4748
run: |
4849
mkdir build && cd build
49-
cmake .. -DFAST_BUILD=${{ matrix.fast-build }} -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DHIGHSINT64=${{ matrix.int64 }}
50+
cmake .. -DFAST_BUILD=${{ matrix.fast-build }} -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DHIGHSINT64=${{ matrix.int64 }} -DHIGHS_NO_DEFAULT_THREADS=ON
5051
5152
- name: Build
5253
# Execute the build. You can specify a specific target with "--target <NAME>"

0 commit comments

Comments
 (0)