diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 4c7ca4a9fc..8ba54643bc 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -67,7 +67,7 @@ jobs: with: repository: rte-france/xpress-mp path: ${{ env.XPRESS_INSTALL_DIR }} - ref: "9.0" + ref: "9.0b" token: ${{ secrets.ACCESS_TOKEN }} - name: set Xpress variables diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 46e8987c23..a94b4392b1 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -96,11 +96,11 @@ jobs: - name: Set-up Xpress with pip run: | - python3 -m pip install xpress==9.0.0 + 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: Configure OR-Tools run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9841aed74b..4b93785c1b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -60,13 +60,13 @@ jobs: - name: Set-up Xpress with pip for Ubuntu shell: bash run: | - python -m pip install xpress==9.0.0 + 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: ccache if: ${{ startsWith(matrix.os, 'ubuntu') }} diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index bcb15a4428..8fb183aa8c 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -18,9 +18,9 @@ jobs: name: Windows cpp runs-on: windows-latest env: - XPRESSDIR: ${{ github.workspace }}/xpressmp - XPRESS: ${{ github.workspace }}/xpressmp/bin - XPAUTH_PATH: ${{ github.workspace }}/xpressmp/bin/xpauth.xpr + XPRESSDIR: ${{ github.workspace }}\\xpressmp + XPRESS: ${{ github.workspace }}\\xpressmp\\bin + XPAUTH_PATH: ${{ github.workspace }}\\xpressmp\\bin\\xpauth.xpr strategy: fail-fast: false diff --git a/.github/workflows/windows-java-dotnet.yml b/.github/workflows/windows-java-dotnet.yml index 5b6421805e..6b78d77057 100644 --- a/.github/workflows/windows-java-dotnet.yml +++ b/.github/workflows/windows-java-dotnet.yml @@ -18,9 +18,9 @@ jobs: name: Windows java and dotnet runs-on: windows-latest env: - XPRESSDIR: ${{ github.workspace }}/xpressmp - XPRESS: ${{ github.workspace }}/xpressmp/bin - XPAUTH_PATH: ${{ github.workspace }}/xpressmp/bin/xpauth.xpr + XPRESSDIR: ${{ github.workspace }}\\xpressmp + XPRESS: ${{ github.workspace }}\\xpressmp\\bin + XPAUTH_PATH: ${{ github.workspace }}\\xpressmp\\bin\\xpauth.xpr strategy: fail-fast: false steps: diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index bd25ae69a4..e8a00493ec 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -18,9 +18,9 @@ jobs: name: Windows python ${{ matrix.python.version }} runs-on: windows-latest env: - XPRESSDIR: ${{ github.workspace }}/xpressmp - XPRESS: ${{ github.workspace }}/xpressmp/bin - XPAUTH_PATH: ${{ github.workspace }}/xpressmp/bin/xpauth.xpr + XPRESSDIR: ${{ github.workspace }}\\xpressmp + XPRESS: ${{ github.workspace }}\\xpressmp\\bin + XPAUTH_PATH: ${{ github.workspace }}\\xpressmp\\bin\\xpauth.xpr strategy: fail-fast: false matrix: