Test_c7_30

Signed-off-by: arnaud <[email protected]>
ARnDOSrte · Nov 27, 2023 · 2c5fc58 · 2c5fc58
1 parent 0c81c9f
commit 2c5fc58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,6 +43,7 @@ jobs:
           cmake -S external \
                 -B build-linux/external \
                 -DCMAKE_BUILD_TYPE=Release \
+                -DUSE_CENTOS7=OFF \
                 -DUSE_XPRESS=${{ matrix.xprs }} \
                 -DXPRESS_ROOT="${{ env.XPRESSDIR }}"
 
@@ -59,6 +60,7 @@ jobs:
                 -DCMAKE_INSTALL_PREFIX=build-linux/install \
                 -DINSTALL_CMAKE_DIR=. \
                 -DUSE_ORTOOLS=ON \
+                -DUSE_CENTOS7=OFF
                 -DUSE_XPRESS=${{ matrix.xprs }} \
                 -DXPRESS_ROOT="${{ env.XPRESSDIR }}"
 

diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Configure 3rd parties
         run: |
           source /opt/rh/devtoolset-9/enable
-          cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external -DCMAKE_BUILD_TYPE=Release -DUSE_XPRESS=${{ matrix.xprs }} -DXPRESS_ROOT="${{ env.XPRESSDIR }}"
+          cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external -DCMAKE_BUILD_TYPE=Release -DUSE_CENTOS7=ON -DUSE_XPRESS=${{ matrix.xprs }} -DXPRESS_ROOT="${{ env.XPRESSDIR }}"
 
       - name: Build 3rd parties
         working-directory: metrix-simulator
@@ -81,6 +81,7 @@ jobs:
                 -DCMAKE_INSTALL_PREFIX=build-centos7/install \
                 -DINSTALL_CMAKE_DIR=. \
                 -DUSE_ORTOOLS=ON \
+                -DUSE_CENTOS7=ON \
                 -DUSE_XPRESS=${{ matrix.xprs }} \
                 -DXPRESS_ROOT="${{ env.XPRESSDIR }}"
 

diff --git a/metrix-simulator/external/CMakeLists.txt b/metrix-simulator/external/CMakeLists.txt
@@ -97,9 +97,9 @@ endif()
 set(ortools_url https://github.com/rte-france/or-tools)
 set(ortools_tag v9.5-rte2.0)
 
-option(USE_XPRESS "Use XPRESS in ortools" OFF)
-if (USE_XPRESS)
-  set(ortools_asset "ortools_cxx_ubuntu-20.04_shared_sirius-metrix.zip")
+option(USE_CENTOS7 "Use centos7 " OFF)
+if (USE_CENTOS7)
+  set(ortools_asset "ortools_cxx_centos7_shared_sirius.zip")
 else()
   set(ortools_asset "ortools_cxx_ubuntu-20.04_shared_sirius-metrix.zip")
 endif()