diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index f20f73899..28c773b78 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -73,7 +73,7 @@ jobs: 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.42 $XPRESS_DIR/lib/libxprs.so + ln -s $XPRESS_DIR/lib/libxprs.so.42 $XPRESS_DIR/lib/libxprs.so - name: Update alternatives #mpicxx uses "g++" so we need g++ to be symbolic link to g++-10 diff --git a/.github/workflows/ubuntu-system-deps-build.yml b/.github/workflows/ubuntu-system-deps-build.yml index 52f916054..610d3336e 100644 --- a/.github/workflows/ubuntu-system-deps-build.yml +++ b/.github/workflows/ubuntu-system-deps-build.yml @@ -37,6 +37,17 @@ jobs: python -m pip install --upgrade pip pip install -r requirements-tests.txt + - name: Set-up Xpress with pip for Ubuntu + shell: bash + run: | + python -m pip install "xpress>=9.2,<9.3" + echo ${{ env.pythonLocation }} + XPRESS_DIR=${{ env.pythonLocation }}/lib/python${{ env.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.42 $XPRESS_DIR/lib/libxprs.so + - name: Install mandatory system libraries run: | sudo apt-get update --fix-missing diff --git a/.github/workflows/windows-vcpkg-deps-build.yml b/.github/workflows/windows-vcpkg-deps-build.yml index af97b6562..b1c23269a 100644 --- a/.github/workflows/windows-vcpkg-deps-build.yml +++ b/.github/workflows/windows-vcpkg-deps-build.yml @@ -40,6 +40,16 @@ jobs: python -m pip install --upgrade pip pip install -r requirements-tests.txt + - name: Set-up Xpress with pip + shell: bash + run: | + 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 + cp $XPRESS_DIR/license/community-xpauth.xpr $XPRESS_DIR/bin/xpauth.xpr + echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV + echo "$XPRESS_DIR/bin" >> $GITHUB_PATH + - name: Pre-requisites shell: cmd run: |