merge

Author: galabovaa

.github/workflows/ortools-ubuntu.yml

@@ -1,17 +1,12 @@
 name: ortools-ubuntu
 
 on:
+  push:
+    branches:
+      - main
+  pull_request:
   workflow_dispatch:
 
-
-# on: []
-# on:
-#   push:
-#     branches:
-#       - ortools-c
-#   pull_request:
-#   workflow_dispatch:
-
 concurrency:
   group: ${{github.workflow}}-${{github.ref}}
   cancel-in-progress: true
@@ -96,8 +91,10 @@ jobs:
           pwd
           cmake -S. -B build \
           -DBUILD_DEPS=ON \
+          -DUSE_SCIP=OFF \
+          -DUSE_COINOR=OFF \
           -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/installs
-          cmake --build build -v -j30
+          cmake --build build -v -j2
           cmake --install build
           ls
 

patch.patch

@@ -1,12 +1,12 @@
 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
-index 5416dc7b8f..02d0db9a30 100644
+index 6621130289..dcfe8b3ccb 100644
 --- a/cmake/dependencies/CMakeLists.txt
 +++ b/cmake/dependencies/CMakeLists.txt
-@@ -311,7 +311,7 @@ if(BUILD_HIGHS)
+@@ -318,7 +318,7 @@ if(BUILD_HIGHS)
    FetchContent_Declare(
      highs
      GIT_REPOSITORY "https://github.com/ERGO-Code/HiGHS.git"
--    GIT_TAG        "v1.13.0"
+-    GIT_TAG        "v1.12.0"
 +    GIT_TAG        "latest"
      GIT_SHALLOW TRUE
      UPDATE_COMMAND git reset --hard