Skip to content

Commit

Permalink
Always use xpress
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonMarechal25 committed Feb 29, 2024
1 parent b195dd8 commit ccd79f5
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 13 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build_centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build_oracle8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/centos-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ol8-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ubuntu-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/windows-vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ccd79f5

Please sign in to comment.