From a2559fe89738884a12d5066d1f7aa65600286b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20Mar=C3=A9chal?= <45510813+JasonMarechal25@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:41:20 +0100 Subject: [PATCH] Produce only one asset (with xpress) (#764) Given xpress is now dynamically loaded at runtime it is no more necessary to produce several assets. --- .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 0cefbb0db..433354edf 100644 --- a/.github/workflows/build_centos7.yml +++ b/.github/workflows/build_centos7.yml @@ -75,9 +75,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 ac84da093..e5f32e287 100644 --- a/.github/workflows/build_oracle8.yml +++ b/.github/workflows/build_oracle8.yml @@ -49,9 +49,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 b9de03dc2..c1bc2dc19 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -21,9 +21,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 dc8415fdf..56eee4fc0 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -22,9 +22,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 5c1556284..509140cc5 100644 --- a/.github/workflows/centos-release.yml +++ b/.github/workflows/centos-release.yml @@ -111,7 +111,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 d67709a18..7a2409606 100644 --- a/.github/workflows/ol8-release.yml +++ b/.github/workflows/ol8-release.yml @@ -82,8 +82,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 7ec148bba..7bfd785b9 100644 --- a/.github/workflows/ubuntu-release.yml +++ b/.github/workflows/ubuntu-release.yml @@ -56,7 +56,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 3f234faf5..c7bf2babc 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -56,7 +56,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