From d2e025cec8e564f4f4bcc9890cc8f82713de8ca3 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 17 Sep 2024 15:36:25 +0200 Subject: [PATCH 01/10] remove line about shared libs --- .github/workflows/oracle.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index a4f0c0a..c3de968 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -67,9 +67,9 @@ jobs: dnf clean all rm -rf /var/cache/dnf wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.1.1/swig-4.1.1.tar.gz" - tar xvf swig-4.1.1.tar.gz - rm swig-4.1.1.tar.gz - cd swig-4.1.1 + tar xvf swig-4.2.1.tar.gz + rm swig-4.2.1.tar.gz + cd swig-4.2.1 ./configure --prefix=/usr make -j 4 make install @@ -79,7 +79,11 @@ jobs: if: ${{ matrix.cmake.java == 'ON' }} run: | dnf -y update - dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven + dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel + wget https://dlcdn.apache.org/maven/maven-3/3.8.5/binaries/apache-maven-3.8.5-bin.tar.gz + mkdir /usr/local/maven + tar xzf apache-maven-3.8.5-bin.tar.gz -C /usr/local/maven/ --strip-components=1 + echo "/usr/local/maven/bin/" >> $GITHUB_PATH dnf clean all rm -rf /var/cache/dnf - name: Install python From 3526f9a75b8567684237e2fb1ca7c0b0004ce086 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 17 Sep 2024 15:39:59 +0200 Subject: [PATCH 02/10] fix --- .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 c3de968..01229dd 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -66,7 +66,7 @@ jobs: dnf -y install pcre-devel dnf clean all rm -rf /var/cache/dnf - wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.1.1/swig-4.1.1.tar.gz" + wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.1.1/swig-4.2.1.tar.gz" tar xvf swig-4.2.1.tar.gz rm swig-4.2.1.tar.gz cd swig-4.2.1 From accf936b462976a99cfe9622eb0ba807fb8756ec Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 17 Sep 2024 15:53:11 +0200 Subject: [PATCH 03/10] fix --- .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 01229dd..2e8efc7 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -74,7 +74,7 @@ jobs: make -j 4 make install cd .. - rm -rf swig-4.1.1 + rm -rf swig-4.2.1 - name: Install java (jdk) if: ${{ matrix.cmake.java == 'ON' }} run: | From c71f3e43c0b6a2a02a3523dd6194b60f3695ea17 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 17 Sep 2024 16:10:59 +0200 Subject: [PATCH 04/10] fix --- .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 2e8efc7..4abf1c1 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -66,7 +66,7 @@ jobs: dnf -y install pcre-devel dnf clean all rm -rf /var/cache/dnf - wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.1.1/swig-4.2.1.tar.gz" + wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" tar xvf swig-4.2.1.tar.gz rm swig-4.2.1.tar.gz cd swig-4.2.1 From 8ed9ecfe862cf86020d21149c7395953336a913c Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Tue, 17 Sep 2024 16:16:25 +0200 Subject: [PATCH 05/10] fix --- .github/workflows/oracle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 4abf1c1..6c22bfe 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -80,9 +80,9 @@ jobs: run: | dnf -y update dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel - wget https://dlcdn.apache.org/maven/maven-3/3.8.5/binaries/apache-maven-3.8.5-bin.tar.gz + wget https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz mkdir /usr/local/maven - tar xzf apache-maven-3.8.5-bin.tar.gz -C /usr/local/maven/ --strip-components=1 + tar xzf apache-maven-3.8.8-bin.tar.gz -C /usr/local/maven/ --strip-components=1 echo "/usr/local/maven/bin/" >> $GITHUB_PATH dnf clean all rm -rf /var/cache/dnf From e2bb260cf16f5dfd5c676148dc343dc5f74e4460 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Fri, 20 Sep 2024 10:16:32 +0200 Subject: [PATCH 06/10] try fix windows-python.yml --- .github/workflows/windows-python.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index dfe4a48..f5cd20d 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -75,6 +75,11 @@ jobs: - name: Install python3 run: python3 -m pip install --user mypy-protobuf absl-py setuptools wheel numpy pandas + - name: Add Python binaries to path + run: > + echo "$((Get-Item ~).FullName)/AppData/Roaming/Python/${{ matrix.python.dir }}/Scripts" | + Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Apply patch shell: bash @@ -82,19 +87,6 @@ jobs: cp -r patch/ortools patch/patch.py patch/patch_utils.py patch/cmake_patches . python patch.py - - name: Install SWIG 4.1.1 - run: | - (New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.1.1.zip","swigwin-4.1.1.zip"); - Expand-Archive .\swigwin-4.1.1.zip .; - echo "$((Get-Item .).FullName)/swigwin-4.1.1" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - Remove-Item .\swigwin-4.1.1.zip - - name: Check swig - run: swig -version - - name: Add Python binaries to path Windows - run: > - echo "$((Get-Item ~).FullName)/AppData/Roaming/Python/${{ matrix.python.dir }}/Scripts" | - Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Set-up Xpress with pip shell: bash run: | From 4ab17b9a4c9b0487def31a587bfb5fa259bdef5a Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Fri, 20 Sep 2024 11:36:39 +0200 Subject: [PATCH 07/10] try continue on error for python tests windows windows-python.yml --- .github/workflows/windows-python.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index f5cd20d..0e3e915 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -119,6 +119,7 @@ jobs: -v -j2 - name: Tests not xpress + continue-on-error: true working-directory: ./build/ run: > ctest -C Release From ee81770b39b83a82a564b8cc23996068ed51005e Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Fri, 20 Sep 2024 16:02:05 +0200 Subject: [PATCH 08/10] accept suggestions --- .github/workflows/oracle.yml | 9 +++++---- .github/workflows/windows-python.yml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 6c22bfe..e81dade 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -66,10 +66,11 @@ jobs: dnf -y install pcre-devel dnf clean all rm -rf /var/cache/dnf - wget -q "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" - tar xvf swig-4.2.1.tar.gz - rm swig-4.2.1.tar.gz - cd swig-4.2.1 + SWIG_BASE_NAME="swig-4.2.1" + wget -q "https://downloads.sourceforge.net/project/swig/swig/${SWIG_BASE_NAME}/${SWIG_BASE_NAME}.tar.gz" + tar xvf ${SWIG_BASE_NAME}.tar.gz + rm ${SWIG_BASE_NAME}.tar.gz + cd ${SWIG_BASE_NAME} ./configure --prefix=/usr make -j 4 make install diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index 0e3e915..eb7bd0f 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -119,7 +119,7 @@ jobs: -v -j2 - name: Tests not xpress - continue-on-error: true + continue-on-error: true # reactivate when fixed on google/or-tools working-directory: ./build/ run: > ctest -C Release From 5a384f6a2c527abfcff58b28bc2d2f1ea0c23905 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Fri, 20 Sep 2024 16:04:04 +0200 Subject: [PATCH 09/10] improve oracle.yml --- .github/workflows/oracle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index e81dade..6233c51 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -30,6 +30,7 @@ jobs: container: 'oraclelinux:8' env: SIRIUS_RELEASE_TAG: antares-integration-v1.4 + SWIG_BASE_NAME: swig-4.2.1 strategy: fail-fast: false matrix: @@ -66,11 +67,10 @@ jobs: dnf -y install pcre-devel dnf clean all rm -rf /var/cache/dnf - SWIG_BASE_NAME="swig-4.2.1" - wget -q "https://downloads.sourceforge.net/project/swig/swig/${SWIG_BASE_NAME}/${SWIG_BASE_NAME}.tar.gz" - tar xvf ${SWIG_BASE_NAME}.tar.gz - rm ${SWIG_BASE_NAME}.tar.gz - cd ${SWIG_BASE_NAME} + wget -q "https://downloads.sourceforge.net/project/swig/swig/${{ env.SWIG_BASE_NAME }}/${{ env.SWIG_BASE_NAME }}.tar.gz" + tar xvf ${{ env.SWIG_BASE_NAME }}.tar.gz + rm ${{ env.SWIG_BASE_NAME }}.tar.gz + cd ${{ env.SWIG_BASE_NAME }} ./configure --prefix=/usr make -j 4 make install From 895af85302c2406afd4f454aa5b0644f6fd7a5ea Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Fri, 20 Sep 2024 16:27:06 +0200 Subject: [PATCH 10/10] add todo --- .github/workflows/windows-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index eb7bd0f..06796b3 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -119,7 +119,7 @@ jobs: -v -j2 - name: Tests not xpress - continue-on-error: true # reactivate when fixed on google/or-tools + continue-on-error: true # TODO reactivate when fixed on google/or-tools working-directory: ./build/ run: > ctest -C Release