Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into neos…

…4LargeBnds
ERGO-Code · Jun 11, 2024 · 0ae7aa0 · 0ae7aa0
2 parents 2ab17c5 + 7689da7
commit 0ae7aa0
Show file tree

Hide file tree

Showing 50 changed files with 1,069 additions and 616 deletions.
diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml
@@ -185,7 +185,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.7.0
+        run: dotnet pack -c Release /p:Version=1.7.1
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
@@ -48,7 +48,7 @@ jobs:
           python3 -m pytest $GITHUB_WORKSPACE
 
   build_sdist_win:
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
@@ -37,7 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.17
+        uses: pypa/cibuildwheel@v2.18.1
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
       - uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -1,6 +1,7 @@
 name: build-wheels
 
 on: [push]
+# on: [pull_request]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.17
+        uses: pypa/cibuildwheel@v2.18.1
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
 

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   fast_build_release:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
         run: cmake $GITHUB_WORKSPACE -DALL_TESTS=ON
 
   fast_build_release_all_tests:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v4
@@ -79,7 +79,7 @@ jobs:
         run: cmake --install .
 
   windows_release_fb_off:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v4
@@ -211,7 +211,7 @@ jobs:
         run: ctest --parallel --timeout 300 --output-on-failure -C Debug
 
   windows_release64:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v4
@@ -245,7 +245,7 @@ jobs:
         run: ctest --timeout 300 --output-on-failure -C Release 
 
   windows_release64_all_tests:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v4
@@ -280,7 +280,7 @@ jobs:
 
 
   windows_release64_fb_off:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v4
@@ -413,4 +413,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  --output-on-failure -C Debug
+        run: ctest  --output-on-failure -C Debug
diff --git a/.github/workflows/cmake-linux-cpp.yml b/.github/workflows/cmake-linux-cpp.yml
@@ -0,0 +1,101 @@
+name: cmake-linux-cpp
+
+on: [push, pull_request]
+
+jobs:
+  release:
+    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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE 
+
+      - name: Build
+        working-directory: ${{runner.workspace}}/build
+        run: cmake --build . --parallel
+
+      - name: Test
+        working-directory: ${{runner.workspace}}/build
+        run: ctest --parallel --timeout 300 --output-on-failure
+
+  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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DALL_TESTS=ON
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        run: cmake --build . --parallel 
+
+      - name: Test All
+        working-directory: ${{runner.workspace}}/build
+        run: ctest --parallel --timeout 300 --output-on-failure 
+
+  debug:
+    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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug 
+
+      - name: Build
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: cmake --build . --parallel
+
+      - name: Test
+        working-directory: ${{runner.workspace}}/build
+        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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DALL_TESTS=ON
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        run: cmake --build . --parallel 
+
+      - name: Test All
+        working-directory: ${{runner.workspace}}/build
+        run: ctest --parallel --timeout 300 --output-on-failure
diff --git a/.github/workflows/cmake-macos-cpp.yml b/.github/workflows/cmake-macos-cpp.yml
@@ -0,0 +1,101 @@
+name: cmake-macos-cpp
+
+on: [push, pull_request]
+
+jobs:
+  release:
+    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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE 
+
+      - name: Build
+        working-directory: ${{runner.workspace}}/build
+        run: cmake --build . --parallel
+
+      - name: Test
+        working-directory: ${{runner.workspace}}/build
+        run: ctest --parallel --timeout 300 --output-on-failure
+
+  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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DALL_TESTS=ON
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        run: cmake --build . --parallel 
+
+      - name: Test All
+        working-directory: ${{runner.workspace}}/build
+        run: ctest --parallel --timeout 300 --output-on-failure 
+
+  debug:
+    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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug 
+
+      - name: Build
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: cmake --build . --parallel
+
+      - name: Test
+        working-directory: ${{runner.workspace}}/build
+        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
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DALL_TESTS=ON
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        run: cmake --build . --parallel 
+
+      - name: Test All
+        working-directory: ${{runner.workspace}}/build
+        run: ctest --parallel --timeout 300 --output-on-failure