From b95cdd4d61b5d127815da1ef5836a95e169c875e Mon Sep 17 00:00:00 2001
From: Jason Marechal <jason.marechal+github@gmail.com>
Date: Thu, 29 Feb 2024 14:24:13 +0100
Subject: [PATCH] Always use xpress

---
 .github/workflows/build_centos7.yml  | 6 ++++--
 .github/workflows/build_oracle8.yml  | 5 +++--
 .github/workflows/build_ubuntu.yml   | 6 ++++--
 .github/workflows/build_windows.yml  | 5 +++--
 .github/workflows/centos-release.yml | 5 ++++-
 .github/workflows/ol8-release.yml    | 6 ++++--
 .github/workflows/ubuntu-release.yml | 5 ++++-
 .github/workflows/windows-vcpkg.yml  | 5 ++++-
 8 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_centos7.yml b/.github/workflows/build_centos7.yml
index 1730199e3d..ad57605da6 100644
--- a/.github/workflows/build_centos7.yml
+++ b/.github/workflows/build_centos7.yml
@@ -74,9 +74,11 @@ jobs:
     container: 'antaresrte/rte-antares:centos7-system-deps'
     strategy:
       matrix:
-        xprs: [ { value: XPRESS-ON, ref: 8.13a },
+        xprs: [
+          # { value: XPRESS-ON, ref: 8.13a },
                 { value: XPRESS-ON, ref: 9.2.5 },
-                { value: XPRESS-OFF } ]
+          #        { value: XPRESS-OFF }
+        ]
     env:
       XPRESSDIR: ${{ github.workspace }}/xpress
       XPRESS: ${{ github.workspace }}/xpress/bin
diff --git a/.github/workflows/build_oracle8.yml b/.github/workflows/build_oracle8.yml
index 3640363922..98bb2e13d9 100644
--- a/.github/workflows/build_oracle8.yml
+++ b/.github/workflows/build_oracle8.yml
@@ -48,9 +48,10 @@ jobs:
     container: 'oraclelinux:8'
     strategy:
       matrix:
-        xprs: [ { value: XPRESS-ON, ref: 8.13a },
+        xprs: [ #{ value: XPRESS-ON, ref: 8.13a },
                 { value: XPRESS-ON, ref: 9.2.5 },
-                { value: XPRESS-OFF } ]
+          #        { value: XPRESS-OFF }
+        ]
     needs: [ versions ]
     env:
       XPRESSDIR: ${{ github.workspace }}/xpress
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index ba64758a69..6e37a6a1c5 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -20,9 +20,11 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        xprs: [ { value: XPRESS-ON, ref: 8.13a },
+        xprs: [
+          #{ value: XPRESS-ON, ref: 8.13a },
                 { value: XPRESS-ON, ref: 9.2.5 },
-                { value: XPRESS-OFF } ]
+          #        { value: XPRESS-OFF }
+        ]
     env:
       XPRESSDIR: ${{ github.workspace }}/xpress
       XPRESS: ${{ github.workspace }}/xpress/bin
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 23f97ce5ad..d843312a6b 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -21,9 +21,10 @@ jobs:
       matrix:
         os: [ windows-latest ]
         triplet: [ x64-windows ]
-        xprs: [ { value: XPRESS-ON, ref: 8.13a },
+        xprs: [ #{ value: XPRESS-ON, ref: 8.13a },
                 { value: XPRESS-ON, ref: 9.2.5 },
-                { value: XPRESS-OFF } ]
+          #{ value: XPRESS-OFF }
+        ]
     env:
       XPRESSDIR: ${{ github.workspace }}\xpress
       XPRESS: ${{ github.workspace }}\xpress\bin
diff --git a/.github/workflows/centos-release.yml b/.github/workflows/centos-release.yml
index d57352c9d3..0581292771 100644
--- a/.github/workflows/centos-release.yml
+++ b/.github/workflows/centos-release.yml
@@ -110,7 +110,10 @@ jobs:
     container: 'antaresrte/rte-antares:centos7-system-deps'
     strategy:
       matrix:
-        xprs: [ XPRESS-ON, XPRESS-OFF ]
+        xprs: [
+          XPRESS-ON,
+          #XPRESS-OFF
+        ]
     env:
       XPRESSDIR: ${{ github.workspace }}/xpress
       XPRESS: ${{ github.workspace }}/xpress/bin
diff --git a/.github/workflows/ol8-release.yml b/.github/workflows/ol8-release.yml
index 45f68d1539..fb29d7a42c 100644
--- a/.github/workflows/ol8-release.yml
+++ b/.github/workflows/ol8-release.yml
@@ -81,8 +81,10 @@ jobs:
     container: 'oraclelinux:8'
     strategy:
       matrix:
-        xprs: [ { value: XPRESS-ON, ref: 9.2.5 },
-                { value: XPRESS-OFF } ]
+        xprs: [
+          { value: XPRESS-ON, ref: 9.2.5 },
+          #{ value: XPRESS-OFF }
+        ]
     env:
       XPRESSDIR: ${{ github.workspace }}/xpress
       XPRESS: ${{ github.workspace }}/xpress/bin
diff --git a/.github/workflows/ubuntu-release.yml b/.github/workflows/ubuntu-release.yml
index 4ecc121b1f..e66c0d2351 100644
--- a/.github/workflows/ubuntu-release.yml
+++ b/.github/workflows/ubuntu-release.yml
@@ -55,7 +55,10 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        xprs: [ XPRESS-ON, XPRESS-OFF ]
+        xprs: [
+          XPRESS-ON,
+          #XPRESS-OFF
+        ]
     env:
       XPRESSDIR: ${{ github.workspace }}/xpress
       XPRESS: ${{ github.workspace }}/xpress/bin
diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
index abbebbf60a..a0247b4870 100644
--- a/.github/workflows/windows-vcpkg.yml
+++ b/.github/workflows/windows-vcpkg.yml
@@ -55,7 +55,10 @@ jobs:
       matrix:
         os: [ windows-latest ]
         triplet: [ x64-windows ]
-        xprs: [ XPRESS-ON, XPRESS-OFF ]
+        xprs: [
+          XPRESS-ON,
+          #XPRESS-OFF
+        ]
     env:
       XPRESSDIR: ${{ github.workspace }}\xpress
       XPRESS: ${{ github.workspace }}\xpress\bin