From 452e646c96b78cdc84e4fd3861dd1ad77e472317 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 11:29:44 +0100 Subject: [PATCH 01/18] fix centos.yml --- .github/workflows/centos.yml | 19 +++++++++++-------- .github/workflows/oracle.yml | 1 - 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 85484296042..0c578f610fa 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,13 +73,16 @@ 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-up Xpress from wheel + run: | + mkdir xpress + cd xpress + python3 -m pip download --no-deps --python-version 39 "xpress>=9.2,<9.3" + unzip *.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: set Xpress variables run: | diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 27c76a51ec2..da49d9d2040 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: From 504df96be8efb3b64b28b17d4246c4708a0e0ae1 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 11:36:29 +0100 Subject: [PATCH 02/18] try --- .github/workflows/centos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 0c578f610fa..71eb6e65ec5 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -77,7 +77,7 @@ jobs: run: | mkdir xpress cd xpress - python3 -m pip download --no-deps --python-version 39 "xpress>=9.2,<9.3" + python3 -m pip download --only-binary=:all: --no-deps --python-version 39 "xpress>=9.2,<9.3" unzip *.whl XPRESS_DIR=$PWD/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV From 463e03df4b02c8d6063b80be4d4ec154983c00d7 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 11:48:46 +0100 Subject: [PATCH 03/18] test --- .github/workflows/centos.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 71eb6e65ec5..f21a5bc3cc2 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -75,9 +75,11 @@ jobs: - name: Set-up Xpress from wheel run: | + python3 -m pip download -h + mkdir xpress cd xpress - python3 -m pip download --only-binary=:all: --no-deps --python-version 39 "xpress>=9.2,<9.3" + python3 -m pip download --only-binary=:all: --no-deps --python-version 39 xpress unzip *.whl XPRESS_DIR=$PWD/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV From c24149afc21bb2f730350b4da913cf5992bb9ed9 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 11:54:11 +0100 Subject: [PATCH 04/18] test --- .github/workflows/centos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index f21a5bc3cc2..a979e836f50 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -79,7 +79,7 @@ jobs: mkdir xpress cd xpress - python3 -m pip download --only-binary=:all: --no-deps --python-version 39 xpress + pip3 download --only-binary=:all: --no-deps --python-version 3 xpress unzip *.whl XPRESS_DIR=$PWD/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV From 5c8893aaef6abbc3094e6d9746b1f58d5bef02e9 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 11:59:06 +0100 Subject: [PATCH 05/18] test --- .github/workflows/centos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index a979e836f50..ef9c4e72b25 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -76,10 +76,9 @@ jobs: - name: Set-up Xpress from wheel run: | python3 -m pip download -h - mkdir xpress cd xpress - pip3 download --only-binary=:all: --no-deps --python-version 3 xpress + pip3 download xpress unzip *.whl XPRESS_DIR=$PWD/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV From 3b93567459c317dcccbdb99b97b7f5d0879f3e7d Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 12:03:12 +0100 Subject: [PATCH 06/18] try 1 --- .github/workflows/centos.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index ef9c4e72b25..54c83ca83c3 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -69,22 +69,22 @@ jobs: with: cmake-version: '3.22.x' - - name: Checkout OR-Tools - run: | - git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${BRANCH_NAME} . - - name: Set-up Xpress from wheel run: | python3 -m pip download -h mkdir xpress cd xpress - pip3 download xpress + pip3 download --python-version 310 xpress unzip *.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: Checkout OR-Tools + run: | + git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${BRANCH_NAME} . + - name: set Xpress variables run: | cd ${{ env.XPRESS_INSTALL_DIR }} From ab7fe3d8ca4b5736dbe5ea47b140d6d49fc4bbdb Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 12:05:57 +0100 Subject: [PATCH 07/18] try 2 --- .github/workflows/centos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 54c83ca83c3..a07293ca24d 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -74,8 +74,8 @@ jobs: python3 -m pip download -h mkdir xpress cd xpress - pip3 download --python-version 310 xpress - unzip *.whl + pip3 download --only-binary=:all: --python-version 310 xpress + unzip xpr*.whl XPRESS_DIR=$PWD/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV echo "XPAUTH_PATH=$XPRESS_DIR/license/community-xpauth.xpr" >> $GITHUB_ENV From 1f7a034ffaa4530c60d6784bde186b26ebbdf2dd Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 12:06:53 +0100 Subject: [PATCH 08/18] try 2 --- .github/workflows/oracle.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-cpp.yml | 2 +- .github/workflows/windows-java-dotnet.yml | 2 +- .github/workflows/windows-python.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index da49d9d2040..72bd600a163 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - release/* + - DISABLErelease/* release: types: [ created ] diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1363a559ba3..14a55c56a21 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - release/* + - DISABLErelease/* release: types: [ created ] diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index 16022782389..5daf283d81f 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - release/* + - DISABLErelease/* release: types: [ created ] diff --git a/.github/workflows/windows-java-dotnet.yml b/.github/workflows/windows-java-dotnet.yml index 78df26797a9..74028150020 100644 --- a/.github/workflows/windows-java-dotnet.yml +++ b/.github/workflows/windows-java-dotnet.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - release/* + - DISABLErelease/* release: types: [ created ] diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index 66540e55680..5247bf89edb 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - release/* + - DISABLErelease/* release: types: [ created ] From 8199bb75a35508eeab91f2fb0467de2fd3d4dada Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 12:55:29 +0100 Subject: [PATCH 09/18] try 3 --- .github/workflows/centos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index a07293ca24d..ab3c64fffef 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -74,7 +74,7 @@ jobs: python3 -m pip download -h mkdir xpress cd xpress - pip3 download --only-binary=:all: --python-version 310 xpress + pip3 download --only-binary=:all: --platform linux_x86_64 --implementation cp --python-version 310 xpress unzip xpr*.whl XPRESS_DIR=$PWD/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV From c0965bbb2d2fcea2e23fed4be1ac09d53b3964a4 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 13:01:42 +0100 Subject: [PATCH 10/18] try 4 --- .github/workflows/centos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index ab3c64fffef..7bb822a85c5 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -71,7 +71,7 @@ jobs: - name: Set-up Xpress from wheel run: | - python3 -m pip download -h + pip3 install --upgrade pip mkdir xpress cd xpress pip3 download --only-binary=:all: --platform linux_x86_64 --implementation cp --python-version 310 xpress From 7adcea11551b50ff25e2304e742dc758e2cde06f Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 13:05:17 +0100 Subject: [PATCH 11/18] try 5 --- .github/workflows/centos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 7bb822a85c5..f9983f8ac04 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -71,10 +71,10 @@ jobs: - name: Set-up Xpress from wheel run: | - pip3 install --upgrade pip + python3 -m pip install --upgrade pip mkdir xpress cd xpress - pip3 download --only-binary=:all: --platform linux_x86_64 --implementation cp --python-version 310 xpress + python3 -m pip download --only-binary=:all: --python-version 310 xpress unzip xpr*.whl XPRESS_DIR=$PWD/xpress echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV From bfc937fe6344e510668f9a5f2e07cb5473921108 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 13:08:14 +0100 Subject: [PATCH 12/18] try 6 --- .github/workflows/centos.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index f9983f8ac04..a5b822a67fa 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -69,6 +69,10 @@ jobs: with: cmake-version: '3.22.x' + - name: Checkout OR-Tools + run: | + git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${BRANCH_NAME} . + - name: Set-up Xpress from wheel run: | python3 -m pip install --upgrade pip @@ -81,10 +85,6 @@ jobs: 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: Checkout OR-Tools - run: | - git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${BRANCH_NAME} . - - name: set Xpress variables run: | cd ${{ env.XPRESS_INSTALL_DIR }} From fada073dbc36e2b4b7ae80ca26f56af6dea02f94 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 13:10:58 +0100 Subject: [PATCH 13/18] try 7 --- .github/workflows/centos.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index a5b822a67fa..0e7810ff4b2 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -85,12 +85,6 @@ jobs: 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: set Xpress variables - run: | - cd ${{ env.XPRESS_INSTALL_DIR }} - echo "XPRESSDIR=$PWD" >> $GITHUB_ENV - echo "XPAUTH_PATH=$PWD/bin/xpauth.xpr" >> $GITHUB_ENV - - name: Download Sirius if : ${{ matrix.sirius == 'ON' }} run: | From fd7bdb85107a94f6375f418084a0380b90b10a85 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 14:22:39 +0100 Subject: [PATCH 14/18] re enable other OS --- .github/workflows/oracle.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-cpp.yml | 2 +- .github/workflows/windows-java-dotnet.yml | 2 +- .github/workflows/windows-python.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 72bd600a163..da49d9d2040 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - DISABLErelease/* + - release/* release: types: [ created ] diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 14a55c56a21..1363a559ba3 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - DISABLErelease/* + - release/* release: types: [ created ] diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index 5daf283d81f..16022782389 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - DISABLErelease/* + - release/* release: types: [ created ] diff --git a/.github/workflows/windows-java-dotnet.yml b/.github/workflows/windows-java-dotnet.yml index 74028150020..78df26797a9 100644 --- a/.github/workflows/windows-java-dotnet.yml +++ b/.github/workflows/windows-java-dotnet.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - DISABLErelease/* + - release/* release: types: [ created ] diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index 5247bf89edb..66540e55680 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -7,7 +7,7 @@ on: - feature/* - merge* - fix/* - - DISABLErelease/* + - release/* release: types: [ created ] From 0c9d56ccc3c3a58f9f61ad188d1c2e61fa333302 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 15:41:52 +0100 Subject: [PATCH 15/18] test --- .github/workflows/oracle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index da49d9d2040..7df62bc97ef 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -35,6 +35,8 @@ jobs: - name: set name variables id: names run: | + BUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} + echo $BUILD_EXAMPLES SHARED=${{ matrix.cmake.shared }} [ $SHARED == "ON" ] && WITH_SHARED="_shared" || WITH_SHARED="_static" SIRIUS=${{ matrix.sirius }} From e98e148ff768cf486ff6e86181d713db8cf424f7 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 15:43:50 +0100 Subject: [PATCH 16/18] test 2 --- .github/workflows/oracle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 7df62bc97ef..734abcaed94 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -35,7 +35,7 @@ jobs: - name: set name variables id: names run: | - BUILD_EXAMPLES=${{ env.RELEASE_CREATED && 'OFF' || 'ON' }} + BUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} echo $BUILD_EXAMPLES SHARED=${{ matrix.cmake.shared }} [ $SHARED == "ON" ] && WITH_SHARED="_shared" || WITH_SHARED="_static" From 73ca1f6e3eb61716186eca95094db84669b861a5 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 15:46:37 +0100 Subject: [PATCH 17/18] fix ternary operator --- .github/workflows/centos.yml | 2 +- .github/workflows/oracle.yml | 4 +--- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-cpp.yml | 2 +- .github/workflows/windows-java-dotnet.yml | 2 +- .github/workflows/windows-python.yml | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 0e7810ff4b2..c9609a5c53f 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -105,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 734abcaed94..33dc4af335b 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -35,8 +35,6 @@ jobs: - name: set name variables id: names run: | - BUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} - echo $BUILD_EXAMPLES SHARED=${{ matrix.cmake.shared }} [ $SHARED == "ON" ] && WITH_SHARED="_shared" || WITH_SHARED="_static" SIRIUS=${{ matrix.sirius }} @@ -129,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..0583613bbd6 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -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..2c164d9cad5 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -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..63c632ff814 100644 --- a/.github/workflows/windows-java-dotnet.yml +++ b/.github/workflows/windows-java-dotnet.yml @@ -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..b5411fae595 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -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 From 8ede55bfbb50d668b116f72fa95f4190babb279e Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 9 Jan 2024 15:50:15 +0100 Subject: [PATCH 18/18] xpress 9.0 to 9.2 --- .github/workflows/centos.yml | 2 +- .github/workflows/oracle.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows-cpp.yml | 2 +- .github/workflows/windows-java-dotnet.yml | 2 +- .github/workflows/windows-python.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index c9609a5c53f..5c5575be65a 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -78,7 +78,7 @@ jobs: python3 -m pip install --upgrade pip mkdir xpress cd xpress - python3 -m pip download --only-binary=:all: --python-version 310 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 diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 33dc4af335b..3d3230e15b0 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -101,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' }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0583613bbd6..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' }} diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index 2c164d9cad5..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 diff --git a/.github/workflows/windows-java-dotnet.yml b/.github/workflows/windows-java-dotnet.yml index 63c632ff814..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 diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index b5411fae595..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