Skip to content

Commit

Permalink
Merge pull request #1796 from ERGO-Code/latest
Browse files Browse the repository at this point in the history
Merge latest for release
  • Loading branch information
galabovaa authored Jun 10, 2024
2 parents 13363c9 + b14f4aa commit 2963303
Show file tree
Hide file tree
Showing 189 changed files with 12,852 additions and 3,066 deletions.
1 change: 1 addition & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
common --noenable_bzlmod
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
8 changes: 4 additions & 4 deletions .github/workflows/build-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

release:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C RELEASE
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE

debug64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

release64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -133,4 +133,4 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C RELEASE
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE
136 changes: 130 additions & 6 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

debug_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug
- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

release:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -63,7 +94,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

release_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release
- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Release

debug64:
runs-on: ${{ matrix.os }}
Expand All @@ -80,21 +142,52 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DHIGHSINT64=on -DFAST_BUILD=OFF
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DHIGHSINT64=on -DFAST_BUILD=OFF

- name: Build
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release
cmake --build . --parallel --config Debug
- name: Test
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

debug64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug
- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

Release64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -125,4 +218,35 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

Release64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release
- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Release
132 changes: 128 additions & 4 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure
run: ctest --parallel --timeout 300 --output-on-failure

debug_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug
- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

release:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -63,7 +94,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

release_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release
- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

debug64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -94,7 +156,38 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

debug64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake All
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=ON -DALL_TESTS=ON

- name: Build All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Debug
- name: Test All
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

Release64:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -125,4 +218,35 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C Release
run: ctest --parallel --timeout 300 --output-on-failure -C Release

Release64_all_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]

steps:
- uses: actions/checkout@v4

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

- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DHIGHSINT64=on -DALL_TESTS=ON

- name: Build
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: |
cmake --build . --parallel --config Release
- name: Test
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel --timeout 300 --output-on-failure -C Release
10 changes: 6 additions & 4 deletions .github/workflows/build-meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest] # windows-latest takes to long
# macos-latest issue with micromamba action
# windows-latest takes to long
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
fetch-depth: 0

- name: Install Conda environment
uses: mamba-org/setup-micromamba@v1
with:
Expand All @@ -35,9 +38,8 @@ jobs:
meson setup bbdir -Duse_zlib=enabled -Dwith_tests=True
meson test -C bbdir
# highspy no longer compiled with meson, back to
# setuptools and CMakeBuild
# todo: use it optionally in some way
# highspy no longer compiled with meson
# see if it can be done separately if it is needed for meson projects
# - name: Test compiled highspy
# shell: bash -l {0}
# run: |
Expand Down
Loading

0 comments on commit 2963303

Please sign in to comment.