diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 85484296042..5c5575be65a 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -62,7 +62,7 @@ jobs: - name: Install requirements (yum) run: | yum install -y epel-release - yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils + yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils python3 yum install -y devtoolset-9 - name: Setup cmake uses: jwlawson/actions-setup-cmake@v1.13 @@ -73,19 +73,17 @@ jobs: run: | git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${BRANCH_NAME} . - - name: Checkout Xpress linux - uses: actions/checkout@v3 - with: - repository: rte-france/xpress-mp - path: ${{ env.XPRESS_INSTALL_DIR }} - ref: "9.0b" - token: ${{ secrets.ACCESS_TOKEN }} - - - name: set Xpress variables + - name: Set-up Xpress from wheel run: | - cd ${{ env.XPRESS_INSTALL_DIR }} - echo "XPRESSDIR=$PWD" >> $GITHUB_ENV - echo "XPAUTH_PATH=$PWD/bin/xpauth.xpr" >> $GITHUB_ENV + python3 -m pip install --upgrade pip + mkdir xpress + cd xpress + python3 -m pip download --only-binary=:all: --python-version 310 "xpress>=9.2,<9.3" + unzip xpr*.whl + XPRESS_DIR=$PWD/xpress + echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV + echo "XPAUTH_PATH=$XPRESS_DIR/license/community-xpauth.xpr" >> $GITHUB_ENV + ln -s $XPRESS_DIR/lib/libxprs.so.42 $XPRESS_DIR/lib/libxprs.so - name: Download Sirius if : ${{ matrix.sirius == 'ON' }} @@ -107,7 +105,7 @@ jobs: -DBUILD_PYTHON=${{ matrix.python }} \ -DBUILD_JAVA=${{ matrix.java }} \ -DBUILD_DOTNET=${{ matrix.dotnet }} \ - -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} \ + -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} \ -DBUILD_DEPS=ON \ -DUSE_SIRIUS=${{ matrix.sirius }} \ -Dsirius_solver_DIR="${{ env.SIRIUS_CMAKE_DIR }}" \ diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 27c76a51ec2..3d3230e15b0 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -23,7 +23,6 @@ jobs: container: 'oraclelinux:8' env: SIRIUS_RELEASE_TAG: antares-integration-v1.4 - XPRESS_INSTALL_DIR: xpressmp/ strategy: fail-fast: false matrix: @@ -102,11 +101,11 @@ jobs: - name: Set-up Xpress with pip run: | - python3 -m pip install "xpress>=9.0,<9.1" + python3 -m pip install "xpress>=9.2,<9.3" XPRESS_DIR=/usr/local/lib64/python3.9/site-packages/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV echo "XPAUTH_PATH=$XPRESS_DIR/license/community-xpauth.xpr" >> $GITHUB_ENV - ln -s $XPRESS_DIR/lib/libxprs.so.41 $XPRESS_DIR/lib/libxprs.so + ln -s $XPRESS_DIR/lib/libxprs.so.42 $XPRESS_DIR/lib/libxprs.so - name: Download Sirius if: ${{ matrix.sirius == 'ON' }} @@ -128,7 +127,7 @@ jobs: -DBUILD_PYTHON=${{ matrix.cmake.python }} \ -DBUILD_JAVA=${{ matrix.cmake.java }} \ -DBUILD_DOTNET=${{ matrix.cmake.dotnet }} \ - -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} \ + -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} \ -DBUILD_DEPS=ON \ -DUSE_SIRIUS=${{ matrix.sirius }} \ -Dsirius_solver_DIR="${{ env.SIRIUS_CMAKE_DIR }}" \ diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1363a559ba3..b5b512137ce 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -69,13 +69,13 @@ jobs: - name: Set-up Xpress with pip for Ubuntu shell: bash run: | - python -m pip install "xpress>=9.0,<9.1" + python -m pip install "xpress>=9.2,<9.3" echo ${{ env.pythonLocation }} XPRESS_DIR=${{ env.pythonLocation }}/lib/python${{ matrix.cmake.python-version }}/site-packages/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV echo "XPAUTH_PATH=$XPRESS_DIR/license/community-xpauth.xpr" >> $GITHUB_ENV echo "Create symbolic link for XPRESS library file because it is missing in the Python installation" - ln -s $XPRESS_DIR/lib/libxprs.so.41 $XPRESS_DIR/lib/libxprs.so + ln -s $XPRESS_DIR/lib/libxprs.so.42 $XPRESS_DIR/lib/libxprs.so - name: Download Sirius if: ${{ matrix.sirius == 'ON' }} @@ -104,7 +104,7 @@ jobs: -DBUILD_PYTHON=${{ matrix.cmake.python }} -DBUILD_JAVA=${{ matrix.cmake.java }} -DBUILD_DOTNET=${{ matrix.cmake.dotnet }} - -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} + -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} -DBUILD_DEPS=ON -DUSE_SIRIUS=${{ matrix.sirius }} -Dsirius_solver_DIR="${{ env.SIRIUS_CMAKE_DIR }}" diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index 16022782389..9b7a5f64761 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -40,7 +40,7 @@ jobs: - name: Set-up Xpress with pip shell: bash run: | - python -m pip install --no-cache-dir "xpress>=9.0,<9.1" + python -m pip install --no-cache-dir "xpress>=9.2,<9.3" XPRESS_DIR="${{ env.pythonLocation }}\Lib\site-packages\xpress" cp -r $XPRESS_DIR/lib $XPRESS_DIR/bin echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV @@ -67,7 +67,7 @@ jobs: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON - -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} + -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} -DBUILD_SAMPLES=OFF -DCMAKE_INSTALL_PREFIX="install" -DBUILD_FLATZINC=OFF diff --git a/.github/workflows/windows-java-dotnet.yml b/.github/workflows/windows-java-dotnet.yml index 78df26797a9..29357e50920 100644 --- a/.github/workflows/windows-java-dotnet.yml +++ b/.github/workflows/windows-java-dotnet.yml @@ -49,7 +49,7 @@ jobs: - name: Set-up Xpress with pip shell: bash run: | - python -m pip install --no-cache-dir "xpress>=9.0,<9.1" + python -m pip install --no-cache-dir "xpress>=9.2,<9.3" XPRESS_DIR="${{ env.pythonLocation }}\Lib\site-packages\xpress" cp -r $XPRESS_DIR/lib $XPRESS_DIR/bin echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV @@ -64,7 +64,7 @@ jobs: -DCMAKE_BUILD_TYPE=Release -DBUILD_JAVA=ON -DBUILD_DOTNET=ON - -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} + -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} -DBUILD_CXX_SAMPLES=OFF -DBUILD_SAMPLES=OFF -DCMAKE_INSTALL_PREFIX="install" diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index 66540e55680..5b78ce1b99b 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -58,7 +58,7 @@ jobs: - name: Set-up Xpress with pip shell: bash run: | - python -m pip install --no-cache-dir "xpress>=9.0,<9.1" + python -m pip install --no-cache-dir "xpress>=9.2,<9.3" XPRESS_DIR="${{ env.pythonLocation }}\Lib\site-packages\xpress" cp -r $XPRESS_DIR/lib $XPRESS_DIR/bin echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV @@ -73,7 +73,7 @@ jobs: -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -DBUILD_SAMPLES=OFF - -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} + -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} -DBUILD_CXX_SAMPLES=OFF -DBUILD_PYTHON=ON -DBUILD_SAMPLES=OFF