diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 15d84bc5e9..61e1d8ce63 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -162,6 +162,15 @@ jobs: batch-name: valid-v830 os: ${{ matrix.test-platform }} + - name: Run MILP with CBC + if: ${{ env.IS_PUSH == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-milp + variant: "milp-cbc" + os: ${{ matrix.test-platform }} + - name: Run tests introduced in v860 if: ${{ env.IS_PUSH == 'true' }} uses: ./.github/workflows/run-tests diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 22fd808a1f..85cee50659 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -196,6 +196,15 @@ jobs: batch-name: valid-v830 os: ${{ matrix.test-platform }} + - name: Run MILP with CBC + if: ${{ env.IS_PUSH == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-milp + variant: "milp-cbc" + os: ${{ matrix.test-platform }} + - name: Run tests introduced in v860 uses: ./.github/workflows/run-tests with: diff --git a/simtest.json b/simtest.json index 15a52efb72..b2207b2cf4 100644 --- a/simtest.json +++ b/simtest.json @@ -1,3 +1,3 @@ { - "version": "v8.7.2" + "version": "v8.8.0-rc1" } diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 576254bc91..8342eab075 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -65,6 +65,12 @@ if(Python3_Interpreter_FOUND) WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/run-study-tests" ) + add_test( + NAME milp-cbc + COMMAND Python3::Interpreter -m pytest -m json --solver-path=$ --use-ortools --ortools-solver coin + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/run-study-tests" + ) + add_test( NAME parallel COMMAND Python3::Interpreter -m pytest -m json --solver-path=$ --force-parallel