Skip to content

Commit

Permalink
xpress 9 and OL8 release (#750)
Browse files Browse the repository at this point in the history
- Change xpress matrix format to be able to select the xpress version
- Add a job to publish OL8 releases
  • Loading branch information
JasonMarechal25 authored Jan 17, 2024
1 parent eeab08a commit f1aba71
Show file tree
Hide file tree
Showing 7 changed files with 296 additions and 19 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/build_centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ jobs:
container: 'antaresrte/rte-antares:centos7-system-deps'
strategy:
matrix:
xprs: [ XPRESS-ON, XPRESS-OFF ]
xprs: [ { value: XPRESS-ON, ref: 8.13a },
{ value: XPRESS-ON, ref: 9.2.5 },
{ value: XPRESS-OFF } ]
env:
XPRESSDIR: ${{ github.workspace }}/xpress
XPRESS: ${{ github.workspace }}/xpress/bin
Expand All @@ -99,8 +101,8 @@ jobs:
repository: rte-france/xpress-mp
path: ${{ env.XPRESSDIR }}
github-server-url: https://github.com
ref: 8.13a
if: matrix.xprs == 'XPRESS-ON'
ref: ${{matrix.xprs.ref}}
if: matrix.xprs.value == 'XPRESS-ON'

- name: Download pre-compiled librairies
uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
Expand Down Expand Up @@ -129,7 +131,7 @@ jobs:
pip3 install -r requirements-ui.txt
- name: Configure
run: |
[[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
[[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
source /opt/rh/devtoolset-10/enable
export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
export PATH=/usr/lib64/openmpi/bin:$PATH
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build_oracle8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ jobs:
container: 'oraclelinux:8'
strategy:
matrix:
xprs: [ XPRESS-ON, XPRESS-OFF ]
xprs: [ { value: XPRESS-ON, ref: 8.13a },
{ value: XPRESS-ON, ref: 9.2.5 },
{ value: XPRESS-OFF } ]
needs: [ versions ]
env:
XPRESSDIR: ${{ github.workspace }}/xpress
Expand Down Expand Up @@ -76,8 +78,8 @@ jobs:
repository: rte-france/xpress-mp
path: ${{ env.XPRESSDIR }}
github-server-url: https://github.com
ref: 8.13
if: matrix.xprs == 'XPRESS-ON'
ref: ${{matrix.xprs.ref}}
if: matrix.xprs.value == 'XPRESS-ON'

- name: Set up Python
run: |
Expand Down Expand Up @@ -111,7 +113,7 @@ jobs:
- name: Configure
run: |
[[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
[[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
source /opt/rh/gcc-toolset-10/enable
dnf install jsoncpp-devel
export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/build_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ jobs:
strategy:
matrix:
os: [ ubuntu-20.04 ]
xprs: [ XPRESS-ON, XPRESS-OFF ]
xprs: [ { value: XPRESS-ON, ref: 8.13a },
{ value: XPRESS-ON, ref: 9.2.5 },
{ value: XPRESS-OFF } ]
env:
XPRESSDIR: ${{ github.workspace }}/xpress
XPRESS: ${{ github.workspace }}/xpress/bin
Expand All @@ -32,18 +34,18 @@ jobs:
submodules: true

- name: Checkout xpressmp linux
if: matrix.xprs == 'XPRESS-ON'
if: matrix.xprs.value == 'XPRESS-ON'
uses: actions/checkout@v3
with:
repository: rte-france/xpress-mp
path: ${{ env.XPRESSDIR }}
ref: 8.13
ref: ${{ matrix.xprs.ref}}
token: ${{ secrets.AS_TOKEN }} #reniew token periodically

- name: ccache
uses: hendrikmuhs/[email protected]
with:
key: ${{ matrix.os }}-${{ matrix.xprs }}
key: ${{ matrix.os }}-${{ matrix.xprs.value }}

- name: Set up Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -102,7 +104,7 @@ jobs:
shell: bash
#XPRESS_VALUE = ${{ matrix.xprs }} == "XPRESS-ON" ? "ON" : "OFF"
run: |
[[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
[[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
cmake -B _build -S . \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_COMPILER=/usr/bin/gcc-10 \
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ jobs:
matrix:
os: [ windows-latest ]
triplet: [ x64-windows ]
xprs: [ XPRESS-ON, XPRESS-OFF ]
xprs: [ { value: XPRESS-ON, ref: 8.13a },
{ value: XPRESS-ON, ref: 9.2.5 },
{ value: XPRESS-OFF } ]
env:
XPRESSDIR: ${{ github.workspace }}\xpress
XPRESS: ${{ github.workspace }}\xpress\bin
Expand All @@ -35,12 +37,12 @@ jobs:
submodules: true

- name: Checkout xpressmp linux
if: matrix.xprs == 'XPRESS-ON'
if: matrix.xprs.value == 'XPRESS-ON'
uses: actions/checkout@v3
with:
repository: rte-france/xpress-mp-temp
path: ${{ env.XPRESSDIR }}
ref: 8.13a
ref: ${{matrix.xprs.ref}}
token: ${{ secrets.AS_TOKEN }}

- name: Get release
Expand Down Expand Up @@ -125,7 +127,7 @@ jobs:
#I can't seem to expand the variable in the cmake command line so export it in env
shell: bash
run: |
[[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
[[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
echo "XPRESS_VALUE=$XPRESS_VALUE" >> $GITHUB_ENV
- name: Configure
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-userguide-pdf/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
shell: bash
run: |
sudo apt-get update --fix-missing
sudo apt-get install latexmk texlive-latex-recommended texlive-formats-extra
sudo apt-get install -y latexmk texlive-latex-recommended texlive-formats-extra
- id: create
shell: bash
Expand Down
Loading

0 comments on commit f1aba71

Please sign in to comment.