diff --git a/.github/workflows/build_oracle8.yml b/.github/workflows/build_oracle8.yml index 8814e793c..97fcd5be2 100644 --- a/.github/workflows/build_oracle8.yml +++ b/.github/workflows/build_oracle8.yml @@ -63,7 +63,7 @@ jobs: - name: Install System run: | dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core openmpi-devel - dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain zlib-devel python3-devel + dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-10-toolchain zlib-devel python3-devel - uses: actions/checkout@v3 with: @@ -105,13 +105,14 @@ jobs: - name: Install dependencies run: | - source /opt/rh/gcc-toolset-9/enable + source /opt/rh/gcc-toolset-10/enable + pip3 install wheel #Too late to install in requirements.txt pip3 install -r requirements-tests.txt - name: Configure run: | [[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" - source /opt/rh/gcc-toolset-9/enable + source /opt/rh/gcc-toolset-10/enable dnf install jsoncpp-devel export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH export PATH=/usr/lib64/openmpi/bin:$PATH @@ -128,7 +129,7 @@ jobs: - name: Build run: | - source /opt/rh/gcc-toolset-9/enable + source /opt/rh/gcc-toolset-10/enable export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH export PATH=/usr/lib64/openmpi/bin:$PATH cmake --build _build --config Release -j2 diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index 5614af854..25df1a608 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -96,6 +96,7 @@ jobs: uses: ./.github/workflows/compile-boost with: prefix: "../rte-antares-deps-Release/" + load-toolset: 'false' - name: Configure shell: bash diff --git a/.github/workflows/compile-boost/action.yml b/.github/workflows/compile-boost/action.yml index 100430f10..72e116dc0 100644 --- a/.github/workflows/compile-boost/action.yml +++ b/.github/workflows/compile-boost/action.yml @@ -4,13 +4,16 @@ inputs: prefix: description: 'extra qualifiers' required: true + load-toolset: + description: 'load devtoolset 10' + default: 'true' runs: using: "composite" steps: - id: install-boost shell: bash run: | - source /opt/rh/gcc-toolset-9/enable || true + source /opt/rh/gcc-toolset-10/enable || true export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH export PATH=/usr/lib64/openmpi/bin:$PATH wget https://github.com/boostorg/boost/releases/download/boost-1.81.0/boost-1.81.0.tar.gz diff --git a/.github/workflows/compile-tbb/action.yml b/.github/workflows/compile-tbb/action.yml index b5362154b..9deb17fdc 100644 --- a/.github/workflows/compile-tbb/action.yml +++ b/.github/workflows/compile-tbb/action.yml @@ -4,14 +4,16 @@ inputs: cmake: description: 'cmake version' default: cmake - + load-toolset: + description: 'load devtoolset 10' + default: 'true' runs: using: "composite" steps: - id: install-tbb shell: bash run: | - source /opt/rh/gcc-toolset-9/enable || true + source /opt/rh/gcc-toolset-10/enable || true git clone https://github.com/wjakob/tbb.git cd tbb/build ${{ inputs.cmake }} .. diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 63e30b311..6e959664c 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -86,6 +86,7 @@ jobs: uses: ./.github/workflows/compile-boost with: prefix: "../rte-antares-deps-Release/" + load-toolset: 'false' - name: Init submodule diff --git a/.github/workflows/ubuntu-release.yml b/.github/workflows/ubuntu-release.yml index aa2a57e3a..228fe7f90 100644 --- a/.github/workflows/ubuntu-release.yml +++ b/.github/workflows/ubuntu-release.yml @@ -132,6 +132,7 @@ jobs: uses: ./.github/workflows/compile-boost with: prefix: "../rte-antares-deps-Release/" + load-toolset: 'false' - name: Download userguide uses: actions/download-artifact@v3 diff --git a/.github/workflows/ubuntu-system-deps-build.yml b/.github/workflows/ubuntu-system-deps-build.yml index 3985ce4d0..e5153f2d3 100644 --- a/.github/workflows/ubuntu-system-deps-build.yml +++ b/.github/workflows/ubuntu-system-deps-build.yml @@ -48,6 +48,7 @@ jobs: uses: ./.github/workflows/compile-boost with: prefix: "../rte-antares-deps-Release/" + load-toolset: 'false' - name: Read antares-xpansion version