diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index c342cf8..8492b0d 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -28,7 +28,7 @@ jobs: name: shrd=${{ matrix.shared }} sirius=${{ matrix.sirius }} runs-on: ubuntu-latest env: - SIRIUS_RELEASE_TAG: antares-integration-v1.4 + SIRIUS_RELEASE_TAG: antares-integration-v1.7 strategy: fail-fast: false matrix: diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index f4b0f4e..badf0c7 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest container: 'oraclelinux:8' env: - SIRIUS_RELEASE_TAG: antares-integration-v1.4 + SIRIUS_RELEASE_TAG: antares-integration-v1.7 SWIG_BASE_NAME: swig-4.2.1 strategy: fail-fast: false diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3ca7cc4..7954ebd 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-20.04"] + os: ["ubuntu-20.04", "ubuntu-22.04"] cmake: [ {shared: OFF, java: OFF, dotnet: OFF, python: OFF, python-version: "3.8", publish-cxx-or: ON}, {shared: ON, java: ON, dotnet: ON, python: OFF, python-version: "3.8", publish-cxx-or: ON}, @@ -44,7 +44,7 @@ jobs: {shared: ON, java: OFF, dotnet: OFF, python: ON, python-version: "3.10", publish-cxx-or: OFF}, ] sirius: [ON, OFF] - sirius-release-tag: [antares-integration-v1.4] + sirius-release-tag: [antares-integration-v1.7] steps: - name: Checkout this repository uses: actions/checkout@v4 diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index 73ae293..44cf85c 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -24,7 +24,7 @@ env: jobs: build: - name: Windows cpp sirius=${{ matrix.sirius }} sirius-release-tag=${{ matrix.sirius-release-tag }} + name: Windows cpp sirius=${{ matrix.sirius }} sirius-release-tag=${{ matrix.sirius-release-tag }} type=${{ matrix.cmake.config }} runs-on: ${{ matrix.os }} env: SIRIUS_RELEASE_TAG: ${{ matrix.sirius-release-tag }} @@ -35,7 +35,11 @@ jobs: matrix: sirius: [ON, OFF] os: [windows-latest] - sirius-release-tag: [ antares-integration-v1.4 ] + sirius-release-tag: [ antares-integration-v1.7 ] + cmake: [ + {generator: "Visual Studio 17 2022", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: INSTALL}, + {generator: "Visual Studio 17 2022", config: Debug, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: INSTALL}, + ] steps: - name: set or-tools repo vars if release if: ${{ env.RELEASE_CREATED == 'true' }} @@ -105,9 +109,9 @@ jobs: run: > cmake -S. -Bbuild -G "Visual Studio 17 2022" - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CONFIGURATION_TYPES=${{ matrix.cmake.config }} -DBUILD_DEPS=ON - -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || 'ON' }} + -DBUILD_EXAMPLES=${{ env.RELEASE_CREATED == 'true' && 'OFF' || (matrix.cmake.config != 'Release' && 'OFF' || 'ON') }} -DBUILD_SAMPLES=OFF -DCMAKE_INSTALL_PREFIX=install -DUSE_SIRIUS=${{ matrix.sirius }} @@ -117,33 +121,36 @@ jobs: - name: Build run: > cmake --build build - --config Release + --config ${{ matrix.cmake.config }} --target ALL_BUILD -v -j2 - name: Tests not xpress + if: ${{ matrix.cmake.config == 'Release' }} working-directory: ./build/ run: > - ctest -C Release + ctest -C ${{ matrix.cmake.config }} --output-on-failure -E "(_xpress|_sirius)" - name: Tests xpress + if: ${{ matrix.cmake.config == 'Release' }} working-directory: ./build/ run: | $env:XPRESSDIR Get-ChildItem -Path $env:XPRESSDIR - ctest -V -C Release --output-on-failure -R "_xpress" + ctest -V -C ${{ matrix.cmake.config }} --output-on-failure -R "_xpress" - name: Tests sirius + if: ${{ matrix.cmake.config == 'Release' }} working-directory: ./build/ run: > - ctest -V -C Release --output-on-failure -R "sirius" + ctest -V -C ${{ matrix.cmake.config }} --output-on-failure -R "sirius" - name: Install run: > cmake --build build - --config Release + --config ${{ matrix.cmake.config }} --target INSTALL -v @@ -158,9 +165,10 @@ jobs: SIRIUS=${{ matrix.sirius }} [ $SIRIUS == "ON" ] && WITH_SIRIUS="_sirius$SIRIUS_BRANCH" || WITH_SIRIUS="" OS="_${{ matrix.os }}" - APPENDIX="${OS}${WITH_SIRIUS}" + TYPE="_${{ matrix.cmake.config }}" + APPENDIX="${OS}${WITH_SIRIUS}${TYPE}" echo "appendix=$APPENDIX" >> $GITHUB_OUTPUT - APPENDIX_WITH_SHARED="${OS}${WITH_SHARED}${WITH_SIRIUS}" + APPENDIX_WITH_SHARED="${OS}${WITH_SHARED}${WITH_SIRIUS}${TYPE}" echo "appendix_with_shared=$APPENDIX_WITH_SHARED" >> $GITHUB_OUTPUT - name: install zip diff --git a/docker/centos.dockerfile b/docker/centos.dockerfile index cd4ed6f..dab3aa0 100644 --- a/docker/centos.dockerfile +++ b/docker/centos.dockerfile @@ -28,7 +28,7 @@ RUN wget -q "https://cmake.org/files/v3.28/cmake-3.28.3-linux-x86_64.sh" \ && rm cmake-3.28.3-linux-x86_64.sh CMD [ "/usr/bin/bash" ] -ARG SIRIUS_RELEASE_TAG=antares-integration-v1.4 +ARG SIRIUS_RELEASE_TAG=antares-integration-v1.7 # Download Sirius RUN cd /applis &&\ diff --git a/local_test.sh b/local_test.sh index 5434318..94f1d1d 100644 --- a/local_test.sh +++ b/local_test.sh @@ -9,7 +9,7 @@ cp -r ../ortools . python3 patch.py # the content of the directory $SANDBOX_DIR_NAME is the patched ortools SIRIUS_ZIPFILE=ubuntu-20.04_sirius-solver.zip -SIRIUS_RELEASE_TAG="antares-integration-v1.4" +SIRIUS_RELEASE_TAG="antares-integration-v1.7" wget https://github.com/rte-france/sirius-solver/releases/download/$SIRIUS_RELEASE_TAG/$SIRIUS_ZIPFILE unzip $SIRIUS_ZIPFILE mv ubuntu-20.04_sirius-solver-install sirius_install