From a5ace26301feb7a79740becd2d66e0d332f792a0 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 08:58:04 +0200 Subject: [PATCH 01/54] VCPKG manifest mode with minizip and boost only, ubuntu Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 41 ++++++++++++------- src/CMakeLists.txt | 35 +--------------- src/libs/antares/writer/CMakeLists.txt | 3 +- .../src/libs/antares/writer/CMakeLists.txt | 2 +- src/vcpkg.json | 19 +++++++++ vcpkg_manifest/vcpkg.json | 8 ---- 6 files changed, 49 insertions(+), 59 deletions(-) create mode 100644 src/vcpkg.json delete mode 100644 vcpkg_manifest/vcpkg.json diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index dc9a194768..3a1c4c59e9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -36,6 +36,8 @@ jobs: env: ORTOOLS_DIR: ${{ github.workspace }}/or-tools os: ubuntu-20.04 + # Caching strategy of VCPKG dependencies + VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" runs-on: ubuntu-20.04 if: "!contains(github.event.head_commit.message, '[skip ci]')" @@ -45,6 +47,18 @@ jobs: with: ref: ${{ env.REF }} + - name: Cache vcpkg binary dir + id: cache-vcpkg-binary + uses: actions/cache@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-ubuntu-${{ hashFiles('vcpkg.json', '.git/modules/HEAD') }} + # Allows to restore a cache when deps have only partially changed (like adding a dependency) + restore-keys: vcpkg-cache-ubuntu-* + + - name: Install VCPKG + run: ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -54,7 +68,6 @@ jobs: run: | sudo apt-get update sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev - sudo apt-get install libboost-test-dev sudo apt-get install g++-10 gcc-10 - name: Read antares-deps version @@ -95,24 +108,24 @@ jobs: - name: Configure run: | - cmake -B _build -S src \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ - -DDEPS_INSTALL_DIR=${{github.workspace}}/rte-antares-deps-Release \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=ON \ - -DBUILD_not_system=OFF \ - -DBUILD_TOOLS=ON \ - -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install \ - -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/bin/python" + cmake -B _build -S src \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ + -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DDEPS_INSTALL_DIR=${{github.workspace}}/rte-antares-deps-Release \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=ON \ + -DBUILD_not_system=OFF \ + -DBUILD_TOOLS=ON \ + -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install \ + -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/bin/python" - name: Build run: | cmake --build _build -j$(nproc) - # simtest - name: Read simtest version id: simtest-version diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0d37450bba..f416eae357 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -254,10 +254,6 @@ if (NOT sirius_solver_FOUND) message (FATAL_ERROR "Sirius solver not found. Sirius solver can be compiled with -DBUILD_sirius=ON or you can specify previous dependency install directory with -DCMAKE_PREFIX_PATH or -DDEPS_INSTALL_DIR") endif() -#gflags needed for ortools -set(GFLAGS_USE_TARGET_NAMESPACE TRUE) -find_package(gflags) - find_package(ortools) if(NOT ortools_FOUND OR BUILD_ORTOOLS) message(STATUS "OR-Tools tag ${ORTOOLS_TAG}") @@ -284,36 +280,7 @@ message(STATUS "OR-Tools tag ${ORTOOLS_TAG}") FetchContent_MakeAvailable(ortools) endif() -find_package(minizip QUIET) - -if(NOT minizip_FOUND OR BUILD_MINIZIP) - if (NOT minizip_FOUND) - message("minizip not found, downloading") - endif () - if (BUILD_MINIZIP) - message("BUILD_MINIZIP set, downloading") - endif () - # Repository + tag - set(MZ_REPOSITORY "https://github.com/zlib-ng/minizip-ng.git") - set(MZ_TAG "4.0.1") - # CMake flags - set(MZ_LZMA "OFF" CACHE INTERNAL "") - set(MZ_ZSTD "OFF" CACHE INTERNAL "") - set(MZ_BZIP2 "OFF" CACHE INTERNAL "") - set(MZ_PKCRYPT "OFF" CACHE INTERNAL "") - set(MZ_WZAES "OFF" CACHE INTERNAL "") - set(MZ_OPENSSL "OFF" CACHE INTERNAL "") - set(MZ_ICONV "OFF" CACHE INTERNAL "") - - FetchContent_Declare(minizip - GIT_REPOSITORY ${MZ_REPOSITORY} - GIT_TAG ${MZ_TAG} - OVERRIDE_FIND_PACKAGE - ) - - FetchContent_MakeAvailable(minizip) -endif() -find_package(minizip REQUIRED) +find_package(minizip-ng REQUIRED) #wxWidget not needed for all library find is done in ui CMakeLists.txt if (VCPKG_TOOLCHAIN AND NOT BUILD_wxWidgets) diff --git a/src/libs/antares/writer/CMakeLists.txt b/src/libs/antares/writer/CMakeLists.txt index 2a35d9c00e..8391ffc741 100644 --- a/src/libs/antares/writer/CMakeLists.txt +++ b/src/libs/antares/writer/CMakeLists.txt @@ -1,5 +1,4 @@ project(result-writer) -find_package(minizip) add_library(result_writer # Helper class @@ -35,7 +34,7 @@ target_link_libraries(result_writer Antares::benchmarking yuni-static-core PRIVATE - MINIZIP::minizip + MINIZIP::minizip-ng logs inifile io diff --git a/src/tests/src/libs/antares/writer/CMakeLists.txt b/src/tests/src/libs/antares/writer/CMakeLists.txt index 6fe90ee1fd..27cdf7b606 100644 --- a/src/tests/src/libs/antares/writer/CMakeLists.txt +++ b/src/tests/src/libs/antares/writer/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(test-writer Boost::unit_test_framework Antares::result_writer test_utils_unit - MINIZIP::minizip + MINIZIP::minizip-ng ) add_test(NAME writer COMMAND test-writer) diff --git a/src/vcpkg.json b/src/vcpkg.json new file mode 100644 index 0000000000..6d0b3d8e9c --- /dev/null +++ b/src/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "antares-simulator", + "version-string": "9.1.0", + "dependencies": [ + { + "name": "wxwidgets", + "platform": "windows" + }, + "boost-algorithm", + "boost-test", + { + "name": "minizip-ng", + "default-features": false, + "features": [ + "zlib" + ] + } + ] +} \ No newline at end of file diff --git a/vcpkg_manifest/vcpkg.json b/vcpkg_manifest/vcpkg.json deleted file mode 100644 index 15837160b1..0000000000 --- a/vcpkg_manifest/vcpkg.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "antares-simulator", - "version-string": "8.5.0", - "dependencies": [ - "wxwidgets", - "boost-test" - ] -} \ No newline at end of file From a532ded35fd232f6e637eb4cace6c9e8e045545c Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 09:01:22 +0200 Subject: [PATCH 02/54] Fix VCPKG install Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3a1c4c59e9..391010d4f4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -57,7 +57,7 @@ jobs: restore-keys: vcpkg-cache-ubuntu-* - name: Install VCPKG - run: ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: ccache uses: hendrikmuhs/ccache-action@v1.2 From 4d88b9f9894c68c40f4cf25ca98953c086ada8bc Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 09:02:22 +0200 Subject: [PATCH 03/54] To be reverted: disable temporarily non-ununtu CIs Signed-off-by: Sylvain Leclerc --- .github/workflows/sonarcloud.yml | 111 --------- .github/workflows/windows-vcpkg.yml | 344 ---------------------------- 2 files changed, 455 deletions(-) delete mode 100644 .github/workflows/sonarcloud.yml delete mode 100644 .github/workflows/windows-vcpkg.yml diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml deleted file mode 100644 index 9c061abe15..0000000000 --- a/.github/workflows/sonarcloud.yml +++ /dev/null @@ -1,111 +0,0 @@ -name: SonarCloud - -on: - pull_request: - -jobs: - sonarcloud: - name: SonarCloud - runs-on: ${{ matrix.os }} - if: "!contains(github.event.head_commit.message, '[skip ci]')" - strategy: - matrix: - os: [ ubuntu-20.04 ] - - env: - SONAR_SERVER_URL: "https://sonarcloud.io" - ORTOOLS_DIR: ${{ github.workspace }}/or-tools - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - - name: Config OR-Tools URL - run: | - echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV - - - name: Install sonar-scanner and build-wrapper - uses: SonarSource/sonarcloud-github-c-cpp@v2 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: sonarcloud-${{ env.SONAR_SCANNER_VERSION }} - - - name: Install libraries - run: | - sudo apt-get update - sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev - sudo apt-get install libboost-test-dev - sudo apt-get install g++-10 gcc-10 - - - name: Read antares-deps version - id: antares-deps-version - uses: notiz-dev/github-action-json-property@release - with: - path: 'antares-deps-version.json' - prop_path: 'antares_deps_version' - - - name: Download pre-compiled librairies - uses: ./.github/workflows/download-extract-precompiled-libraries-tgz - with: - antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} - os: ${{matrix.os}} - buildtype: Debug - ortools-url: ${{env.ORTOOLS_URL}} - ortools-dir: ${{env.ORTOOLS_DIR}} - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3.12 - - - name: Install gcovr - run: sudo pip install gcovr==5.0 #5.1 generate issues with sonarcloud report parsing - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip3 install -r src/tests/examples/requirements.txt - - - name: Init submodule - run: | - git submodule update --init src/antares-deps - git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests - - - name: Configure - run: | - cmake -B _build -S src \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ - -DDEPS_INSTALL_DIR=./rte-antares-deps-Debug \ - -DCODE_COVERAGE=ON \ - -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_PREFIX_PATH="../install;${{ env.ORTOOLS_DIR }}/install" \ - -DBUILD_TESTING=ON \ - -DMZ_CODE_COVERAGE=ON \ - -DBUILD_not_system=OFF \ - -DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}' - - - name: Build - run: | - build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/_build/output cmake --build _build --config release -j$(nproc) - - - name: Test and generate coverage - continue-on-error: true - run: | - cd $GITHUB_WORKSPACE/_build - ctest -C Release --output-on-failure -L "unit" - - - name: Collect coverage into one XML report - run: | - gcovr --sonarqube --output coverage.xml - - - name: Run sonar-scanner - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml deleted file mode 100644 index 848d8e7471..0000000000 --- a/.github/workflows/windows-vcpkg.yml +++ /dev/null @@ -1,344 +0,0 @@ -name: Windows CI (VCPKG and pre-compiled) - -on: - push: - branches: - - develop - - feature/* - - features/* - - fix/* - - issue-* - - release/* - - doc/* - - dependabot/* - schedule: - - cron: '21 2 * * *' - workflow_call: - inputs: - run-tests: - required: true - type: string - target_branch: - required: true - type: string - -env: - GITHUB_TOKEN: ${{ github.token }} - IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} - RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} - RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} - REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} - - -jobs: - build: - - env: - # Indicates the location of the vcpkg as a Git submodule of the project repository. - VCPKG_ROOT: ${{ github.workspace }}/vcpkg - ORTOOLS_DIR: ${{ github.workspace }}/or-tools - os: windows-latest - test-platform: windows-2022 - vcpkgPackages: wxwidgets boost-test - triplet: x64-windows - - runs-on: windows-latest - - steps: - - - uses: actions/checkout@v4 - with: - ref: ${{ env.REF }} - - - name: Config OR-Tools URL - run: | - echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_windows-latest_static_sirius.zip" >> $GITHUB_ENV - shell: bash - - - name: Pre-requisites - shell: cmd - run: | - choco install wget unzip zip --no-progress - - # Downloads ccache, and copies it to "cl.exe" in order to trick cmake into using it, - # see ccache wiki for background on using it with MSVC: - # https://github.com/ccache/ccache/wiki/MS-Visual-Studio - - name: Install ccache - shell: bash - run: | - wget https://github.com/ccache/ccache/releases/download/v4.8.3/ccache-4.8.3-windows-x86_64.zip -O ccache.zip - unzip ccache.zip - rm ccache.zip - mv ccache-4.8.3-windows-x86_64 ccache - cp ccache/ccache.exe ccache/cl.exe - echo "${GITHUB_WORKSPACE}/ccache" >> $GITHUB_PATH - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: windows - - - name : Init VCPKG submodule - run: | - git submodule update --init vcpkg - - # Restore both vcpkg and its artifacts from the GitHub cache service. - - name: Restore vcpkg and its artifacts. - uses: actions/cache@v4 - with: - # The first path is the location of vcpkg (it contains the vcpkg executable and data files). - # The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages. - path: | - ${{ env.VCPKG_ROOT }} - !${{ env.VCPKG_ROOT }}/buildtrees - !${{ env.VCPKG_ROOT }}/packages - !${{ env.VCPKG_ROOT }}/downloads - # The key is composed in a way that it gets properly invalidated: this must happen whenever vcpkg's Git commit id changes, or the list of packages changes. In this case a cache miss must happen and a new entry with a new key with be pushed to GitHub the cache service. - # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm. - # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already). - key: | - ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ env.triplet }} - - - name : Install deps with VCPKG - run: | - cd vcpkg - ./bootstrap-vcpkg.sh - vcpkg install ${{env.vcpkgPackages}} --triplet ${{env.triplet}} - rm -rf buildtrees packages downloads - shell: bash - - - name: Read antares-deps version - id: antares-deps-version - uses: notiz-dev/github-action-json-property@release - with: - path: 'antares-deps-version.json' - prop_path: 'antares_deps_version' - - - name: Download pre-compiled librairies - uses: ./.github/workflows/download-extract-precompiled-libraries-zip - with: - antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} - os: ${{env.os}} - ortools-url: ${{env.ORTOOLS_URL}} - ortools-dir: ${{env.ORTOOLS_DIR}} - - - name: Setup Python 3.12 - uses: actions/setup-python@v5 - id: setup-python - with: - architecture: 'x64' - python-version: '3.12' - - - name: Install pip dependencies if necessary - run: pip install -r src/tests/examples/requirements.txt - - - name: Init submodule - run: | - git submodule update --init src/antares-deps - git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests - - - name: Enable git longpaths - run: git config --system core.longpaths true - - - name: Configure - shell: bash - run: | - cmake -B _build -S src \ - -DDEPS_INSTALL_DIR=rte-antares-deps-Release \ - -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ - -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ - -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=ON \ - -DBUILD_TOOLS=ON \ - -DBUILD_not_system=OFF \ - -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe" \ - -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle" - - - name: Build - shell: bash - run: | - cmake --build _build --config Release -j$(nproc) - # simtest - - name: Read simtest version - id: simtest-version - uses: notiz-dev/github-action-json-property@release - with: - path: 'simtest.json' - prop_path: 'version' - - - name: Run named mps tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-named-mps - os: ${{ env.test-platform }} - variant: "named-mps" - - - name: Run unfeasibility-related tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - run: | - cd _build - ctest -C Release --output-on-failure -R "^unfeasible$" - - - name: Run unit and end-to-end tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - run: | - cd _build - ctest -C Release --output-on-failure -L "unit|end-to-end" -LE ortools - - - name: Upload build on failure - if: ${{ failure() }} - uses: actions/upload-artifact@v3 - with: - name: MPS-diff - path: ${{ github.workspace }}/src/tests/mps - - - - name: Run tests for adequacy patch (CSR) - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: adequacy-patch-CSR - os: ${{ env.test-platform }} - - - name: Run tests about infinity on BCs RHS - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-v830 - os: ${{ env.test-platform }} - - - name: Run MILP with CBC - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-milp - variant: "milp-cbc" - os: ${{ env.test-platform }} - - - name: Run tests introduced in v860 - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-v860 - os: ${{ env.test-platform }} - - - name: Run tests introduced in v870 - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-v870 - os: ${{ env.test-platform }} - - - name: Run tests introduced in v910 - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-v910 - os: ${{ env.test-platform }} - - - name: Run short-tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: short-tests - os: ${{ env.test-platform }} - - - name: Run mps tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-mps - os: ${{ env.test-platform }} - - - name: Run parallel tests - if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-parallel - os: ${{ env.test-platform }} - variant: "parallel" - - - name: Run medium-tests - if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: medium-tests - os: ${{ env.test-platform }} - - - name: Run long-tests-1 - if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: long-tests-1 - os: ${{ env.test-platform }} - - - name: Run long-tests-2 - if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: long-tests-2 - os: ${{ env.test-platform }} - - - name: Run long-tests-3 - if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: long-tests-3 - os: ${{ env.test-platform }} - - - name: Solver archive creation - shell: bash - run: | - cd _build - zip -r antares-solver_windows.zip solver/Release/antares-solver.exe solver/Release/*.dll - - - name: NSIS Installer creation - shell: bash - run: | - rm -rf src/tests/resources/Antares_Simulator_Tests - cd _build - cpack -GNSIS - export NSIS_NAME=$(ls *.exe) - echo "NSIS_NAME=$NSIS_NAME" >> $GITHUB_ENV - - - name: Upload NSIS log on failure - if: ${{ failure() }} - uses: actions/upload-artifact@v3 - with: - name: NSISError.log - path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log - - - name: .zip creation - run: | - cd _build - cpack -G ZIP - - - name: Installer upload - uses: actions/upload-artifact@v3 - with: - path: _build/${{env.NSIS_NAME}} - - - name: Publish assets - if: ${{ env.IS_RELEASE == 'true' }} - env: - GITHUB_TOKEN: ${{ github.token }} - tag: ${{ github.event.inputs.release_tag }} - run: | - gh release upload "$tag" _build/*.zip _build/*.exe - shell: bash From 01c171990fcbc2755c362f2919b0841cc55b768a Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 09:05:35 +0200 Subject: [PATCH 04/54] Fix toolchain file path Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 391010d4f4..90b89e4485 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -113,7 +113,7 @@ jobs: -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ - -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DDEPS_INSTALL_DIR=${{github.workspace}}/rte-antares-deps-Release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ From ce6f0eeaa0c18db9ce2f27d31a16efc04ca8fb07 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 13:03:29 +0200 Subject: [PATCH 05/54] Fix wxWidgets search Signed-off-by: Sylvain Leclerc --- src/cmake/wxWidgets/FindwxWidgets.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cmake/wxWidgets/FindwxWidgets.cmake b/src/cmake/wxWidgets/FindwxWidgets.cmake index dea003dce6..c174be3ed7 100644 --- a/src/cmake/wxWidgets/FindwxWidgets.cmake +++ b/src/cmake/wxWidgets/FindwxWidgets.cmake @@ -820,7 +820,6 @@ else() find_program(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8 DOC "Location of wxWidgets library configuration provider binary (wx-config)." - ONLY_CMAKE_FIND_ROOT_PATH ) if(wxWidgets_CONFIG_EXECUTABLE) From aaf56bee4d9f024d63419651b9a74e17b6e32100 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 13:14:19 +0200 Subject: [PATCH 06/54] Revert boost from vcpkg for now Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 7 ++++--- src/vcpkg.json | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 90b89e4485..073b759deb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -66,9 +66,10 @@ jobs: - name: Install libraries run: | - sudo apt-get update - sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev - sudo apt-get install g++-10 gcc-10 + sudo apt-get update + sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev + sudo apt-get install libboost-test-dev + sudo apt-get install g++-10 gcc-10 - name: Read antares-deps version id: antares-deps-version diff --git a/src/vcpkg.json b/src/vcpkg.json index 6d0b3d8e9c..b8efd4a698 100644 --- a/src/vcpkg.json +++ b/src/vcpkg.json @@ -6,8 +6,6 @@ "name": "wxwidgets", "platform": "windows" }, - "boost-algorithm", - "boost-test", { "name": "minizip-ng", "default-features": false, @@ -16,4 +14,4 @@ ] } ] -} \ No newline at end of file +} From 8215e8c584ec9f42eee2b48ede0c598a02d97be9 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 13:25:36 +0200 Subject: [PATCH 07/54] Save cache even when build fails Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 073b759deb..ccfa5b9937 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -55,6 +55,7 @@ jobs: key: vcpkg-cache-ubuntu-${{ hashFiles('vcpkg.json', '.git/modules/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) restore-keys: vcpkg-cache-ubuntu-* + save-always: true - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics From ff5182347866aa05d6905fbb3ccb8c6d9d5245b6 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 13:30:32 +0200 Subject: [PATCH 08/54] Fix cache key Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ccfa5b9937..e8679d212b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -52,7 +52,7 @@ jobs: uses: actions/cache@v4 with: path: ${{ github.workspace }}/vcpkg_cache - key: vcpkg-cache-ubuntu-${{ hashFiles('vcpkg.json', '.git/modules/HEAD') }} + key: vcpkg-cache-ubuntu-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) restore-keys: vcpkg-cache-ubuntu-* save-always: true From 33541eb03933160b060f78298adc26087f8e8340 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 13:38:58 +0200 Subject: [PATCH 09/54] Restore windows build Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 332 ++++++++++++++++++++++++++++ 1 file changed, 332 insertions(+) create mode 100644 .github/workflows/windows-vcpkg.yml diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml new file mode 100644 index 0000000000..e40fd5e66f --- /dev/null +++ b/.github/workflows/windows-vcpkg.yml @@ -0,0 +1,332 @@ +name: Windows CI (VCPKG and pre-compiled) + +on: + push: + branches: + - develop + - feature/* + - features/* + - fix/* + - issue-* + - release/* + - doc/* + - dependabot/* + schedule: + - cron: '21 2 * * *' + workflow_call: + inputs: + run-tests: + required: true + type: string + target_branch: + required: true + type: string + +env: + GITHUB_TOKEN: ${{ github.token }} + IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} + RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} + RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} + REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} + + +jobs: + build: + + env: + # Indicates the location of the vcpkg as a Git submodule of the project repository. + VCPKG_ROOT: ${{ github.workspace }}/vcpkg + ORTOOLS_DIR: ${{ github.workspace }}/or-tools + os: windows-latest + test-platform: windows-2022 + vcpkgPackages: wxwidgets boost-test + triplet: x64-windows + # Caching strategy of VCPKG dependencies + VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" + + runs-on: windows-latest + + steps: + + - uses: actions/checkout@v4 + with: + ref: ${{ env.REF }} + + - name: Config OR-Tools URL + run: | + echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_windows-latest_static_sirius.zip" >> $GITHUB_ENV + shell: bash + + - name: Pre-requisites + shell: cmd + run: | + choco install wget unzip zip --no-progress + + # Downloads ccache, and copies it to "cl.exe" in order to trick cmake into using it, + # see ccache wiki for background on using it with MSVC: + # https://github.com/ccache/ccache/wiki/MS-Visual-Studio + - name: Install ccache + shell: bash + run: | + wget https://github.com/ccache/ccache/releases/download/v4.8.3/ccache-4.8.3-windows-x86_64.zip -O ccache.zip + unzip ccache.zip + rm ccache.zip + mv ccache-4.8.3-windows-x86_64 ccache + cp ccache/ccache.exe ccache/cl.exe + echo "${GITHUB_WORKSPACE}/ccache" >> $GITHUB_PATH + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: windows + + - name: Cache vcpkg binary dir + id: cache-vcpkg-binary + uses: actions/cache@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} + # Allows to restore a cache when deps have only partially changed (like adding a dependency) + restore-keys: vcpkg-cache-windows-* + save-always: true + + - name: Install VCPKG + run: | + git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + + - name: Read antares-deps version + id: antares-deps-version + uses: notiz-dev/github-action-json-property@release + with: + path: 'antares-deps-version.json' + prop_path: 'antares_deps_version' + + - name: Download pre-compiled librairies + uses: ./.github/workflows/download-extract-precompiled-libraries-zip + with: + antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} + os: ${{env.os}} + ortools-url: ${{env.ORTOOLS_URL}} + ortools-dir: ${{env.ORTOOLS_DIR}} + + - name: Setup Python 3.12 + uses: actions/setup-python@v5 + id: setup-python + with: + architecture: 'x64' + python-version: '3.12' + + - name: Install pip dependencies if necessary + run: pip install -r src/tests/examples/requirements.txt + + - name: Init submodule + run: | + git submodule update --init src/antares-deps + git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests + + - name: Enable git longpaths + run: git config --system core.longpaths true + + - name: Configure + shell: bash + run: | + cmake -B _build -S src \ + -DDEPS_INSTALL_DIR=rte-antares-deps-Release \ + -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ + -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ + -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ + -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=ON \ + -DBUILD_TOOLS=ON \ + -DBUILD_not_system=OFF \ + -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe" \ + -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle" + + - name: Build + shell: bash + run: | + cmake --build _build --config Release -j$(nproc) + # simtest + - name: Read simtest version + id: simtest-version + uses: notiz-dev/github-action-json-property@release + with: + path: 'simtest.json' + prop_path: 'version' + + - name: Run named mps tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-named-mps + os: ${{ env.test-platform }} + variant: "named-mps" + + - name: Run unfeasibility-related tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + run: | + cd _build + ctest -C Release --output-on-failure -R "^unfeasible$" + + - name: Run unit and end-to-end tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + run: | + cd _build + ctest -C Release --output-on-failure -L "unit|end-to-end" -LE ortools + + - name: Upload build on failure + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: MPS-diff + path: ${{ github.workspace }}/src/tests/mps + + + - name: Run tests for adequacy patch (CSR) + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: adequacy-patch-CSR + os: ${{ env.test-platform }} + + - name: Run tests about infinity on BCs RHS + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-v830 + os: ${{ env.test-platform }} + + - name: Run MILP with CBC + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-milp + variant: "milp-cbc" + os: ${{ env.test-platform }} + + - name: Run tests introduced in v860 + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-v860 + os: ${{ env.test-platform }} + + - name: Run tests introduced in v870 + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-v870 + os: ${{ env.test-platform }} + + - name: Run tests introduced in v910 + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-v910 + os: ${{ env.test-platform }} + + - name: Run short-tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: short-tests + os: ${{ env.test-platform }} + + - name: Run mps tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-mps + os: ${{ env.test-platform }} + + - name: Run parallel tests + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-parallel + os: ${{ env.test-platform }} + variant: "parallel" + + - name: Run medium-tests + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: medium-tests + os: ${{ env.test-platform }} + + - name: Run long-tests-1 + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: long-tests-1 + os: ${{ env.test-platform }} + + - name: Run long-tests-2 + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: long-tests-2 + os: ${{ env.test-platform }} + + - name: Run long-tests-3 + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: long-tests-3 + os: ${{ env.test-platform }} + + - name: Solver archive creation + shell: bash + run: | + cd _build + zip -r antares-solver_windows.zip solver/Release/antares-solver.exe solver/Release/*.dll + + - name: NSIS Installer creation + shell: bash + run: | + rm -rf src/tests/resources/Antares_Simulator_Tests + cd _build + cpack -GNSIS + export NSIS_NAME=$(ls *.exe) + echo "NSIS_NAME=$NSIS_NAME" >> $GITHUB_ENV + + - name: Upload NSIS log on failure + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: NSISError.log + path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log + + - name: .zip creation + run: | + cd _build + cpack -G ZIP + + - name: Installer upload + uses: actions/upload-artifact@v3 + with: + path: _build/${{env.NSIS_NAME}} + + - name: Publish assets + if: ${{ env.IS_RELEASE == 'true' }} + env: + GITHUB_TOKEN: ${{ github.token }} + tag: ${{ github.event.inputs.release_tag }} + run: | + gh release upload "$tag" _build/*.zip _build/*.exe + shell: bash From 54d2717a8131644cca7e8ffae49c360b2c359137 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 13:52:13 +0200 Subject: [PATCH 10/54] Fix vcpkg install Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index e40fd5e66f..843a84013f 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -91,8 +91,9 @@ jobs: save-always: true - name: Install VCPKG + shell: bash run: | - git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.bat -disableMetrics - name: Read antares-deps version id: antares-deps-version From 4fa25676d357c860ceac3855b0b1494fb1536ec1 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 13:57:49 +0200 Subject: [PATCH 11/54] Try fixing toolchain path Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 843a84013f..a835f25639 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -136,7 +136,7 @@ jobs: -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ - -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ From ddf60fd1e3846626d5d6309f6e68e4aab85f4e39 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 14:22:50 +0200 Subject: [PATCH 12/54] Try fiwing workspace path Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index a835f25639..2bcb9ce9ee 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -136,7 +136,7 @@ jobs: -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ - -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="${{ env.GITHUB_WORKSPACE }}/vcpkg/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ From 82f866b0925e4a75af1a6965718f0a5da2971e14 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 14:30:37 +0200 Subject: [PATCH 13/54] Another try Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 2bcb9ce9ee..dd8342b423 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -116,6 +116,8 @@ jobs: with: architecture: 'x64' python-version: '3.12' + cache: 'pip' + cache-dependency-path: 'requirements*.txt' - name: Install pip dependencies if necessary run: pip install -r src/tests/examples/requirements.txt @@ -136,7 +138,7 @@ jobs: -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ - -DCMAKE_TOOLCHAIN_FILE="${{ env.GITHUB_WORKSPACE }}/vcpkg/scripts/buildsystems/vcpkg.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ From fb49715fa46a12b50182a35800fe1c0fd527e0e7 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 14:54:59 +0200 Subject: [PATCH 14/54] Try improving cache logic Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index dd8342b423..eb3a2606d9 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -80,15 +80,14 @@ jobs: with: key: windows - - name: Cache vcpkg binary dir + - name: Restore vcpkg binary dir from cache id: cache-vcpkg-binary - uses: actions/cache@v4 + uses: actions/cache/restore@v4 with: path: ${{ github.workspace }}/vcpkg_cache key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) restore-keys: vcpkg-cache-windows-* - save-always: true - name: Install VCPKG shell: bash @@ -333,3 +332,11 @@ jobs: run: | gh release upload "$tag" _build/*.zip _build/*.exe shell: bash + + - name: Cache vcpkg binary dir + if: always() + id: save-cache-vcpkg-binary + uses: actions/cache/save@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} From c64b6872fc0f67d493b7c8c32707d17a3b4181e3 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 14:55:15 +0200 Subject: [PATCH 15/54] Add boost to windows build Signed-off-by: Sylvain Leclerc --- src/vcpkg.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/vcpkg.json b/src/vcpkg.json index b8efd4a698..a8e0e38c22 100644 --- a/src/vcpkg.json +++ b/src/vcpkg.json @@ -6,6 +6,14 @@ "name": "wxwidgets", "platform": "windows" }, + { + "name": "boost-test", + "platform": "windows" + }, + { + "name": "boost-algorithm", + "platform": "windows" + }, { "name": "minizip-ng", "default-features": false, From a71f0ca9091bf9acbdb7c43934c240ba6c6570c2 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 15:35:53 +0200 Subject: [PATCH 16/54] Try with centos Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 46 ++++++++++++++++++++++++++--------- .github/workflows/ubuntu.yml | 19 ++++++++++----- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index a2f6452ed1..6193d870c0 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -7,6 +7,7 @@ on: branches: - develop - dependabot/* + - feature/vcpkg-linux schedule: - cron: '21 2 * * *' @@ -28,6 +29,8 @@ jobs: name: Build env: ORTOOLSDIR: ${{ github.workspace }}/or-tools + VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" + VCPKG_ROOT: ${{ github.workspace }}/vcpkg runs-on: ubuntu-latest container: 'antaresrte/rte-antares:centos7-simulator-no-deps' @@ -45,6 +48,18 @@ jobs: - uses: ./.github/workflows/install-cmake-328 + - name: Install VCPKG + run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + + - name: Restore vcpkg binary dir from cache + id: cache-vcpkg-binary + uses: actions/cache/restore@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} + # Allows to restore a cache when deps have only partially changed (like adding a dependency) + restore-keys: vcpkg-cache-centos7-* + - name: Init submodule run: | git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests @@ -80,17 +95,18 @@ jobs: - name: Configure run: | - source /opt/rh/devtoolset-10/enable - cmake -B _build -S src \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DDEPS_INSTALL_DIR=/rte-antares-deps-Release \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=ON \ - -DBUILD_not_system=OFF \ - -DBUILD_TOOLS=ON \ - -DBUILD_UI=OFF \ - -DCMAKE_PREFIX_PATH=${{ env.ORTOOLSDIR }}/install \ + source /opt/rh/devtoolset-10/enable + cmake -B _build -S src \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake \ + -DDEPS_INSTALL_DIR=/rte-antares-deps-Release \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=ON \ + -DBUILD_not_system=OFF \ + -DBUILD_TOOLS=ON \ + -DBUILD_UI=OFF \ + -DCMAKE_PREFIX_PATH=${{ env.ORTOOLSDIR }}/install \ - name: Build run: | @@ -137,4 +153,10 @@ jobs: run: | gh release upload "$tag" _build/*.tar.gz _build/*.rpm - \ No newline at end of file + - name: Cache vcpkg binary dir + if: always() + id: save-cache-vcpkg-binary + uses: actions/cache/save@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} \ No newline at end of file diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e8679d212b..2de543fcec 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -47,18 +47,17 @@ jobs: with: ref: ${{ env.REF }} - - name: Cache vcpkg binary dir + - name: Install VCPKG + run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + + - name: Restore vcpkg binary dir from cache id: cache-vcpkg-binary - uses: actions/cache@v4 + uses: actions/cache/restore@v4 with: path: ${{ github.workspace }}/vcpkg_cache key: vcpkg-cache-ubuntu-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) restore-keys: vcpkg-cache-ubuntu-* - save-always: true - - - name: Install VCPKG - run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: ccache uses: hendrikmuhs/ccache-action@v1.2 @@ -309,3 +308,11 @@ jobs: tag: ${{ github.event.inputs.release_tag }} run: | gh release upload "$tag" _build/*.tar.gz _build/*.deb + + - name: Cache vcpkg binary dir + if: always() + id: save-cache-vcpkg-binary + uses: actions/cache/save@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-ubuntu-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} From 1b19dfb44c463e88947002925e29a3c481377eb0 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 16:51:01 +0200 Subject: [PATCH 17/54] No VCPKG cache for centos, for now Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 6193d870c0..b970ddb1d6 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -29,7 +29,6 @@ jobs: name: Build env: ORTOOLSDIR: ${{ github.workspace }}/or-tools - VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" VCPKG_ROOT: ${{ github.workspace }}/vcpkg runs-on: ubuntu-latest @@ -51,15 +50,6 @@ jobs: - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics - - name: Restore vcpkg binary dir from cache - id: cache-vcpkg-binary - uses: actions/cache/restore@v4 - with: - path: ${{ github.workspace }}/vcpkg_cache - key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} - # Allows to restore a cache when deps have only partially changed (like adding a dependency) - restore-keys: vcpkg-cache-centos7-* - - name: Init submodule run: | git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests @@ -152,11 +142,3 @@ jobs: tag: ${{ github.event.inputs.release_tag }} run: | gh release upload "$tag" _build/*.tar.gz _build/*.rpm - - - name: Cache vcpkg binary dir - if: always() - id: save-cache-vcpkg-binary - uses: actions/cache/save@v4 - with: - path: ${{ github.workspace }}/vcpkg_cache - key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} \ No newline at end of file From eeca546a7250d2aecc5a8eb7b56f5a3e218c5a10 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 17:21:11 +0200 Subject: [PATCH 18/54] Try to fix path to vcpkg Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index b970ddb1d6..d10e341470 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -27,13 +27,14 @@ jobs: build: name: Build - env: - ORTOOLSDIR: ${{ github.workspace }}/or-tools - VCPKG_ROOT: ${{ github.workspace }}/vcpkg runs-on: ubuntu-latest container: 'antaresrte/rte-antares:centos7-simulator-no-deps' + env: + ORTOOLSDIR: ${{ env.GITHUB_WORKSPACE }}/or-tools + VCPKG_ROOT: ${{ env.GITHUB_WORKSPACE }}/vcpkg + steps: - name: Checkout From bcb14cc8ed5f57378e6a9591db9cc5bf9c8f2e14 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 18:46:07 +0200 Subject: [PATCH 19/54] Log for debugging Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index d10e341470..6eb5008c75 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -27,14 +27,13 @@ jobs: build: name: Build + env: + ORTOOLSDIR: ${{ github.workspace }}/or-tools + VCPKG_ROOT: ${{ github.workspace }}/vcpkg runs-on: ubuntu-latest container: 'antaresrte/rte-antares:centos7-simulator-no-deps' - env: - ORTOOLSDIR: ${{ env.GITHUB_WORKSPACE }}/or-tools - VCPKG_ROOT: ${{ env.GITHUB_WORKSPACE }}/vcpkg - steps: - name: Checkout @@ -51,6 +50,9 @@ jobs: - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + - name: List files + run: ls ${{ env.VCPKG_ROOT }} + - name: Init submodule run: | git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests From 64b59bbb2363ccb2c283fe1d931276987f0744ce Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 18:56:48 +0200 Subject: [PATCH 20/54] Try install cmake with pip instead Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 6eb5008c75..1458d2a63e 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -45,14 +45,15 @@ jobs: yum install -y centos-release-scl yum install -y devtoolset-10-gcc* - - uses: ./.github/workflows/install-cmake-328 + - name: Install cmake 3.28 + run: pip3 install cmake==3.28.4 - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: List files run: ls ${{ env.VCPKG_ROOT }} - + - name: Init submodule run: | git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests From 8d996a16136d8d827fb82c025722342b646320a6 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 19:06:40 +0200 Subject: [PATCH 21/54] More logs Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 1458d2a63e..40543abce5 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -40,19 +40,24 @@ jobs: run: | git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . - - name: Install gcc 10 - run: | - yum install -y centos-release-scl - yum install -y devtoolset-10-gcc* - - - name: Install cmake 3.28 - run: pip3 install cmake==3.28.4 - - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + - name: Current directory + run: echo $PWD + continue-on-error: true + + - name: List files + run: ls vcpkg + continue-on-error: true + - name: List files run: ls ${{ env.VCPKG_ROOT }} + continue-on-error: true + + - name: List files + run: ls vcpkg + continue-on-error: true - name: Init submodule run: | From 5e26bbda6b09772fd5587f78b46a7f7c6d00cd1e Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 19:07:40 +0200 Subject: [PATCH 22/54] Temporarily disable ubuntu & windows Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 10 ---------- .github/workflows/windows-vcpkg.yml | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2de543fcec..1b730c260e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,16 +1,6 @@ name: Ubuntu CI (push and/or release) on: - push: - branches: - - develop - - feature/* - - features/* - - fix/* - - issue-* - - release/* - - doc/* - - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index eb3a2606d9..9947975a08 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -1,16 +1,6 @@ name: Windows CI (VCPKG and pre-compiled) on: - push: - branches: - - develop - - feature/* - - features/* - - fix/* - - issue-* - - release/* - - doc/* - - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: From c6fa5b976af45549ad44f8a93d5a23849f86e6d7 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 19:14:09 +0200 Subject: [PATCH 23/54] Try fix path Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 40543abce5..d56068e536 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -98,7 +98,7 @@ jobs: cmake -B _build -S src \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=${{ env.GITHUB_WORKSPACE }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DDEPS_INSTALL_DIR=/rte-antares-deps-Release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ From 3339c9e30ea6f9f87c42e2f7874f02b1d686c44a Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 19:19:16 +0200 Subject: [PATCH 24/54] Restore gcc install Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index d56068e536..8c1ef4dc2a 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -29,7 +29,6 @@ jobs: name: Build env: ORTOOLSDIR: ${{ github.workspace }}/or-tools - VCPKG_ROOT: ${{ github.workspace }}/vcpkg runs-on: ubuntu-latest container: 'antaresrte/rte-antares:centos7-simulator-no-deps' @@ -40,24 +39,16 @@ jobs: run: | git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . - - name: Install VCPKG - run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics - - - name: Current directory - run: echo $PWD - continue-on-error: true - - - name: List files - run: ls vcpkg - continue-on-error: true + - name: Install gcc 10 + run: | + yum install -y centos-release-scl + yum install -y devtoolset-10-gcc* - - name: List files - run: ls ${{ env.VCPKG_ROOT }} - continue-on-error: true + - name: Install cmake 3.28 + run: pip3 install cmake==3.28.4 - - name: List files - run: ls vcpkg - continue-on-error: true + - name: Install VCPKG + run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: Init submodule run: | @@ -91,7 +82,6 @@ jobs: dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo dnf -y install gh - - name: Configure run: | source /opt/rh/devtoolset-10/enable From e675c96716298a188b2442ce54dfe77a65b66308 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 19:25:43 +0200 Subject: [PATCH 25/54] Again another try Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 8c1ef4dc2a..2e2b3ffc03 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -88,7 +88,7 @@ jobs: cmake -B _build -S src \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_TOOLCHAIN_FILE=${{ env.GITHUB_WORKSPACE }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DDEPS_INSTALL_DIR=/rte-antares-deps-Release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ From 9e426f880a2011a83ace1012217c81738919f6f5 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 19:50:28 +0200 Subject: [PATCH 26/54] Fix git version Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 2e2b3ffc03..f3b84c3117 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -85,6 +85,7 @@ jobs: - name: Configure run: | source /opt/rh/devtoolset-10/enable + source /opt/rh/rh-git227/enable cmake -B _build -S src \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ From 72f62ef130d6c31e71f4537066a128ad79a942e5 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 20:32:07 +0200 Subject: [PATCH 27/54] Fix packaging too Signed-off-by: Sylvain Leclerc --- src/packaging/Config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packaging/Config.cmake.in b/src/packaging/Config.cmake.in index be7a1a62fa..dc37f5d9cd 100644 --- a/src/packaging/Config.cmake.in +++ b/src/packaging/Config.cmake.in @@ -2,7 +2,7 @@ include(CMakeFindDependencyMacro) find_dependency(ortools) -find_dependency(minizip) +find_dependency(minizip-ng) include("${CMAKE_CURRENT_LIST_DIR}/AntaresTargets.cmake") From b3de6f3e9bc4ca0175bc5d0724d94f296415cf4d Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 20:36:36 +0200 Subject: [PATCH 28/54] Try oracle 8 Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 1 - .github/workflows/oracle8.yml | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index f3b84c3117..12ded8b366 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -7,7 +7,6 @@ on: branches: - develop - dependabot/* - - feature/vcpkg-linux schedule: - cron: '21 2 * * *' diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 683eebaff5..69c7085a4a 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -7,6 +7,7 @@ on: branches: - develop - dependabot/* + - feature/vcpkg-linux schedule: - cron: '21 2 * * *' @@ -49,6 +50,9 @@ jobs: run: | git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . + - name: Install VCPKG + run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + - name: Config OR-Tools URL run: | echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_oraclelinux-8_static_sirius.zip" >> $GITHUB_ENV @@ -79,13 +83,14 @@ jobs: - name: Configure run: | - source /opt/rh/gcc-toolset-11/enable - cmake -B _build -S src \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=ON \ - -DBUILD_TOOLS=ON \ - -DBUILD_UI=OFF \ - -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install + source /opt/rh/gcc-toolset-11/enable + cmake -B _build -S src \ + -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=ON \ + -DBUILD_TOOLS=ON \ + -DBUILD_UI=OFF \ + -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install - name: Build run: | From cd23b2c75b72edf8da0403f3cb71987b99a51e47 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 2 May 2024 20:50:08 +0200 Subject: [PATCH 29/54] Fix security error Signed-off-by: Sylvain Leclerc --- .github/workflows/oracle8.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 69c7085a4a..f47edaccde 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -48,7 +48,8 @@ jobs: - name: Checkout run: | - git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . + git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . + git config --global safe.directory '*' - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics @@ -66,9 +67,7 @@ jobs: rm ortools.zip - name: Init submodule - run: | - git config --global safe.directory '*' - git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests + run: git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests - name: Install dependencies run: | From 83331e06a699cdc7f11f546ee5b715aa3e7524e8 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 08:40:39 +0200 Subject: [PATCH 30/54] Revert "Temporarily disable ubuntu & windows" This reverts commit 5e26bbda6b09772fd5587f78b46a7f7c6d00cd1e. --- .github/workflows/ubuntu.yml | 10 ++++++++++ .github/workflows/windows-vcpkg.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1b730c260e..2de543fcec 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,6 +1,16 @@ name: Ubuntu CI (push and/or release) on: + push: + branches: + - develop + - feature/* + - features/* + - fix/* + - issue-* + - release/* + - doc/* + - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 9947975a08..eb3a2606d9 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -1,6 +1,16 @@ name: Windows CI (VCPKG and pre-compiled) on: + push: + branches: + - develop + - feature/* + - features/* + - fix/* + - issue-* + - release/* + - doc/* + - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: From 6b71d90d9715a57fccee40d3ac13d659a261d448 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 10:09:55 +0200 Subject: [PATCH 31/54] Hashing after submodule update Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index eb3a2606d9..0a4eceef8b 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -80,6 +80,11 @@ jobs: with: key: windows + - name: Install VCPKG + shell: bash + run: | + git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.bat -disableMetrics + - name: Restore vcpkg binary dir from cache id: cache-vcpkg-binary uses: actions/cache/restore@v4 @@ -89,11 +94,6 @@ jobs: # Allows to restore a cache when deps have only partially changed (like adding a dependency) restore-keys: vcpkg-cache-windows-* - - name: Install VCPKG - shell: bash - run: | - git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.bat -disableMetrics - - name: Read antares-deps version id: antares-deps-version uses: notiz-dev/github-action-json-property@release From 62a6e8f2ac279ec675ffeb85273f6e734be215af Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 10:17:35 +0200 Subject: [PATCH 32/54] Fix restore keys Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-vcpkg.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2de543fcec..5709be0921 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -57,7 +57,7 @@ jobs: path: ${{ github.workspace }}/vcpkg_cache key: vcpkg-cache-ubuntu-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) - restore-keys: vcpkg-cache-ubuntu-* + restore-keys: vcpkg-cache-ubuntu- - name: ccache uses: hendrikmuhs/ccache-action@v1.2 diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 0a4eceef8b..f06b6947ac 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -92,7 +92,7 @@ jobs: path: ${{ github.workspace }}/vcpkg_cache key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) - restore-keys: vcpkg-cache-windows-* + restore-keys: vcpkg-cache-windows- - name: Read antares-deps version id: antares-deps-version From 0a52474088c0ecef572f5a119d6c2fc1c69a6c56 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 10:19:34 +0200 Subject: [PATCH 33/54] Disable ubuntu & windows Signed-off-by: Sylvain Leclerc --- .github/workflows/ubuntu.yml | 10 ---------- .github/workflows/windows-vcpkg.yml | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 5709be0921..5600edb6cb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,16 +1,6 @@ name: Ubuntu CI (push and/or release) on: - push: - branches: - - develop - - feature/* - - features/* - - fix/* - - issue-* - - release/* - - doc/* - - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index f06b6947ac..3cd6003497 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -1,16 +1,6 @@ name: Windows CI (VCPKG and pre-compiled) on: - push: - branches: - - develop - - feature/* - - features/* - - fix/* - - issue-* - - release/* - - doc/* - - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: From 9f3b2c185b4836d14bf544a2fb53dcbee18ab21c Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 10:22:09 +0200 Subject: [PATCH 34/54] Try cache action downgraded Signed-off-by: Sylvain Leclerc --- .github/workflows/oracle8.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index f47edaccde..1c5427faff 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -54,6 +54,15 @@ jobs: - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + - name: Restore vcpkg binary dir from cache + id: cache-vcpkg-binary + uses: actions/cache/restore@v3 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} + # Allows to restore a cache when deps have only partially changed (like adding a dependency) + restore-keys: vcpkg-cache-windows- + - name: Config OR-Tools URL run: | echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_oraclelinux-8_static_sirius.zip" >> $GITHUB_ENV @@ -139,3 +148,11 @@ jobs: tag: ${{ github.event.inputs.release_tag }} run: | gh release upload "$tag" _build/*.tar.gz _build/*.rpm + + - name: Cache vcpkg binary dir + if: always() + id: save-cache-vcpkg-binary + uses: actions/cache/save@v3 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} From e4953d532b47979a7ff99e7cc71c058b5b87595c Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 10:33:58 +0200 Subject: [PATCH 35/54] Try cache action v3 on centos7 Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 18 ++++++++++++++++++ .github/workflows/oracle8.yml | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 12ded8b366..c74ece4d3a 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -7,6 +7,7 @@ on: branches: - develop - dependabot/* + - feature/vcpkg-linux schedule: - cron: '21 2 * * *' @@ -49,6 +50,15 @@ jobs: - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + - name: Restore vcpkg binary dir from cache + id: cache-vcpkg-binary + uses: actions/cache/restore@v3 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} + # Allows to restore a cache when deps have only partially changed (like adding a dependency) + restore-keys: vcpkg-cache-centos7- + - name: Init submodule run: | git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests @@ -141,3 +151,11 @@ jobs: tag: ${{ github.event.inputs.release_tag }} run: | gh release upload "$tag" _build/*.tar.gz _build/*.rpm + + - name: Cache vcpkg binary dir + if: always() + id: save-cache-vcpkg-binary + uses: actions/cache/save@v3 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 1c5427faff..67d6368d02 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -59,9 +59,9 @@ jobs: uses: actions/cache/restore@v3 with: path: ${{ github.workspace }}/vcpkg_cache - key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} + key: vcpkg-cache-oracle8-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) - restore-keys: vcpkg-cache-windows- + restore-keys: vcpkg-cache-oracle8- - name: Config OR-Tools URL run: | @@ -155,4 +155,4 @@ jobs: uses: actions/cache/save@v3 with: path: ${{ github.workspace }}/vcpkg_cache - key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} + key: vcpkg-cache-oracle8-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} From 512a0912391fa07c5ff3d2825dec263ffde15702 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 10:48:06 +0200 Subject: [PATCH 36/54] Add actual caching Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 2 ++ .github/workflows/oracle8.yml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index c74ece4d3a..dcddcbf152 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -22,6 +22,8 @@ env: IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}} + # Caching strategy of VCPKG dependencies + VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" jobs: diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 67d6368d02..13dade2c81 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -22,7 +22,8 @@ env: IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}} - + # Caching strategy of VCPKG dependencies + VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" jobs: From 046436d1365425cb485380ed9aeab76f21f1bb34 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 11:28:38 +0200 Subject: [PATCH 37/54] Try env vars Signed-off-by: Sylvain Leclerc --- .github/workflows/oracle8.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 13dade2c81..6b698a841d 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -22,8 +22,6 @@ env: IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}} - # Caching strategy of VCPKG dependencies - VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" jobs: @@ -52,6 +50,12 @@ jobs: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . git config --global safe.directory '*' + - name: Set VCPKG path + run: | + echo "VCPKG_ROOT=$GITHUB_WORKSPACE/vcpkg" >> $GITHUB_ENV + echo "VCPKG_CACHE_DIR=$GITHUB_WORKSPACE/vcpkg_cache" >> $GITHUB_ENV + echo "VCPKG_BINARY_SOURCES="clear;files,$GITHUB_WORKSPACE/vcpkg_cache,readwrite" >> $GITHUB_ENV + - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics @@ -59,7 +63,7 @@ jobs: id: cache-vcpkg-binary uses: actions/cache/restore@v3 with: - path: ${{ github.workspace }}/vcpkg_cache + path: ${{ env.VCPKG_CACHE_DIR }} key: vcpkg-cache-oracle8-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) restore-keys: vcpkg-cache-oracle8- @@ -155,5 +159,5 @@ jobs: id: save-cache-vcpkg-binary uses: actions/cache/save@v3 with: - path: ${{ github.workspace }}/vcpkg_cache + path: ${{ env.VCPKG_CACHE_DIR }} key: vcpkg-cache-oracle8-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} From ff0d26182832f60f8baceaaefbb73f2ea33df40b Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 11:29:30 +0200 Subject: [PATCH 38/54] Skip some tests for testing Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 1 - .github/workflows/oracle8.yml | 49 ----------------------------------- 2 files changed, 50 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index dcddcbf152..27a941f683 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -7,7 +7,6 @@ on: branches: - develop - dependabot/* - - feature/vcpkg-linux schedule: - cron: '21 2 * * *' diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 6b698a841d..549d68a190 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -105,55 +105,6 @@ jobs: -DBUILD_UI=OFF \ -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install - - name: Build - run: | - source /opt/rh/gcc-toolset-11/enable - cmake --build _build --config Release -j$(nproc) - - - name: Run unit and end-to-end tests - if: ${{ env.IS_PUSH == 'true' }} - run: | - cd _build - ctest -C Release --output-on-failure -L "unit|end-to-end" - - - name: Installer .rpm creation - run: | - cd _build - cpack -G RPM - - - name: Solver archive creation - run: | - cd _build - cmake --install . --prefix install - pushd . - cd install/bin - tar czf ../../antares-solver_oracle8.tar.gz antares-solver libsirius_solver.so - popd - rm -rf install - - - name: .tar.gz creation - run: | - cd _build - cpack -G TGZ - - - name: Installer TGZ push - uses: actions/upload-artifact@v3 - with: - path: _build/*.tar.gz - - - name: Installer RPM push - uses: actions/upload-artifact@v3 - with: - path: _build/*.rpm - - - name: Publish assets - if: ${{ env.IS_RELEASE == 'true' }} - env: - GITHUB_TOKEN: ${{ github.token }} - tag: ${{ github.event.inputs.release_tag }} - run: | - gh release upload "$tag" _build/*.tar.gz _build/*.rpm - - name: Cache vcpkg binary dir if: always() id: save-cache-vcpkg-binary From 3e78a3cf93341ae6d7367984e831e9f706fad07c Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 11:33:36 +0200 Subject: [PATCH 39/54] fix Signed-off-by: Sylvain Leclerc --- .github/workflows/oracle8.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 549d68a190..fa8338927f 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -54,7 +54,7 @@ jobs: run: | echo "VCPKG_ROOT=$GITHUB_WORKSPACE/vcpkg" >> $GITHUB_ENV echo "VCPKG_CACHE_DIR=$GITHUB_WORKSPACE/vcpkg_cache" >> $GITHUB_ENV - echo "VCPKG_BINARY_SOURCES="clear;files,$GITHUB_WORKSPACE/vcpkg_cache,readwrite" >> $GITHUB_ENV + echo "VCPKG_BINARY_SOURCES=\"clear;files,$GITHUB_WORKSPACE/vcpkg_cache,readwrite\"" >> $GITHUB_ENV - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics From 3e1ea50fcb32b66b1ea39b487ffa6ac4cf785ac7 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 11:37:20 +0200 Subject: [PATCH 40/54] fix Signed-off-by: Sylvain Leclerc --- .github/workflows/oracle8.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index fa8338927f..9d6af49916 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -54,7 +54,7 @@ jobs: run: | echo "VCPKG_ROOT=$GITHUB_WORKSPACE/vcpkg" >> $GITHUB_ENV echo "VCPKG_CACHE_DIR=$GITHUB_WORKSPACE/vcpkg_cache" >> $GITHUB_ENV - echo "VCPKG_BINARY_SOURCES=\"clear;files,$GITHUB_WORKSPACE/vcpkg_cache,readwrite\"" >> $GITHUB_ENV + echo "VCPKG_BINARY_SOURCES=clear;files,$GITHUB_WORKSPACE/vcpkg_cache,readwrite" >> $GITHUB_ENV - name: Install VCPKG run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics From 1671e1e67851f0974536d2e93f6ce7a211b684f7 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 11:46:09 +0200 Subject: [PATCH 41/54] Revert "Skip some tests for testing" This reverts commit ff0d26182832f60f8baceaaefbb73f2ea33df40b. --- .github/workflows/centos7.yml | 1 + .github/workflows/oracle8.yml | 49 +++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 27a941f683..dcddcbf152 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -7,6 +7,7 @@ on: branches: - develop - dependabot/* + - feature/vcpkg-linux schedule: - cron: '21 2 * * *' diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 9d6af49916..68fb2a8307 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -105,6 +105,55 @@ jobs: -DBUILD_UI=OFF \ -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install + - name: Build + run: | + source /opt/rh/gcc-toolset-11/enable + cmake --build _build --config Release -j$(nproc) + + - name: Run unit and end-to-end tests + if: ${{ env.IS_PUSH == 'true' }} + run: | + cd _build + ctest -C Release --output-on-failure -L "unit|end-to-end" + + - name: Installer .rpm creation + run: | + cd _build + cpack -G RPM + + - name: Solver archive creation + run: | + cd _build + cmake --install . --prefix install + pushd . + cd install/bin + tar czf ../../antares-solver_oracle8.tar.gz antares-solver libsirius_solver.so + popd + rm -rf install + + - name: .tar.gz creation + run: | + cd _build + cpack -G TGZ + + - name: Installer TGZ push + uses: actions/upload-artifact@v3 + with: + path: _build/*.tar.gz + + - name: Installer RPM push + uses: actions/upload-artifact@v3 + with: + path: _build/*.rpm + + - name: Publish assets + if: ${{ env.IS_RELEASE == 'true' }} + env: + GITHUB_TOKEN: ${{ github.token }} + tag: ${{ github.event.inputs.release_tag }} + run: | + gh release upload "$tag" _build/*.tar.gz _build/*.rpm + - name: Cache vcpkg binary dir if: always() id: save-cache-vcpkg-binary From af6210d4053af358851f43bd01b705efe713b695 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 14:06:18 +0200 Subject: [PATCH 42/54] Fix vcpkg cache paths on centos Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 16 +++++++++++----- .github/workflows/oracle8.yml | 10 ++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index dcddcbf152..556a43e14f 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -22,8 +22,6 @@ env: IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}} - # Caching strategy of VCPKG dependencies - VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" jobs: @@ -50,13 +48,21 @@ jobs: run: pip3 install cmake==3.28.4 - name: Install VCPKG - run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + # Note: we need to use environment variables instead of workflow variables + # because github messes up path variables when running in container, + # see https://github.com/actions/runner/issues/2058 + run: | + git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + echo "VCPKG_ROOT=$GITHUB_WORKSPACE/vcpkg" >> $GITHUB_ENV + echo "VCPKG_CACHE_DIR=$GITHUB_WORKSPACE/vcpkg_cache" >> $GITHUB_ENV + echo "VCPKG_BINARY_SOURCES=clear;files,$GITHUB_WORKSPACE/vcpkg_cache,readwrite" >> $GITHUB_ENV - name: Restore vcpkg binary dir from cache id: cache-vcpkg-binary + # Note: we are stuck with v3, because v4 is not compatible with oracle8 image uses: actions/cache/restore@v3 with: - path: ${{ github.workspace }}/vcpkg_cache + path: ${{ env.VCPKG_CACHE_DIR }} key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} # Allows to restore a cache when deps have only partially changed (like adding a dependency) restore-keys: vcpkg-cache-centos7- @@ -159,5 +165,5 @@ jobs: id: save-cache-vcpkg-binary uses: actions/cache/save@v3 with: - path: ${{ github.workspace }}/vcpkg_cache + path: ${{ env.VCPKG_CACHE_DIR }} key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 68fb2a8307..0fd77a8f11 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -50,17 +50,19 @@ jobs: git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} . git config --global safe.directory '*' - - name: Set VCPKG path + - name: Install VCPKG + # Note: we need to use environment variables instead of workflow variables + # because github messes up path variables when running in container, + # see https://github.com/actions/runner/issues/2058 run: | + git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics echo "VCPKG_ROOT=$GITHUB_WORKSPACE/vcpkg" >> $GITHUB_ENV echo "VCPKG_CACHE_DIR=$GITHUB_WORKSPACE/vcpkg_cache" >> $GITHUB_ENV echo "VCPKG_BINARY_SOURCES=clear;files,$GITHUB_WORKSPACE/vcpkg_cache,readwrite" >> $GITHUB_ENV - - name: Install VCPKG - run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics - - name: Restore vcpkg binary dir from cache id: cache-vcpkg-binary + # Note: we are stuck with v3, because v4 is not compatible with oracle8 image uses: actions/cache/restore@v3 with: path: ${{ env.VCPKG_CACHE_DIR }} From 66bf8fae3c1f4dc3bcaedc86483be7b90945a6f9 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 14:26:53 +0200 Subject: [PATCH 43/54] Revert "Disable ubuntu & windows" This reverts commit 0a52474088c0ecef572f5a119d6c2fc1c69a6c56. --- .github/workflows/ubuntu.yml | 10 ++++++++++ .github/workflows/windows-vcpkg.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 5600edb6cb..5709be0921 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,6 +1,16 @@ name: Ubuntu CI (push and/or release) on: + push: + branches: + - develop + - feature/* + - features/* + - fix/* + - issue-* + - release/* + - doc/* + - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 3cd6003497..f06b6947ac 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -1,6 +1,16 @@ name: Windows CI (VCPKG and pre-compiled) on: + push: + branches: + - develop + - feature/* + - features/* + - fix/* + - issue-* + - release/* + - doc/* + - dependabot/* schedule: - cron: '21 2 * * *' workflow_call: From 53dfa9bbae8f525c9701e8dbebf05b304b23d1f8 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 14:28:34 +0200 Subject: [PATCH 44/54] Disable centos and oracle on PRs Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 1 - .github/workflows/oracle8.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 556a43e14f..36fa8162dd 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -7,7 +7,6 @@ on: branches: - develop - dependabot/* - - feature/vcpkg-linux schedule: - cron: '21 2 * * *' diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 0fd77a8f11..35f09e3d8d 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -7,7 +7,6 @@ on: branches: - develop - dependabot/* - - feature/vcpkg-linux schedule: - cron: '21 2 * * *' From be5b618426660c9aba87234e9548facd64daa2e5 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 15:04:04 +0200 Subject: [PATCH 45/54] Restore sonarcloud Signed-off-by: Sylvain Leclerc --- .github/workflows/sonarcloud.yml | 111 +++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 .github/workflows/sonarcloud.yml diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml new file mode 100644 index 0000000000..9c061abe15 --- /dev/null +++ b/.github/workflows/sonarcloud.yml @@ -0,0 +1,111 @@ +name: SonarCloud + +on: + pull_request: + +jobs: + sonarcloud: + name: SonarCloud + runs-on: ${{ matrix.os }} + if: "!contains(github.event.head_commit.message, '[skip ci]')" + strategy: + matrix: + os: [ ubuntu-20.04 ] + + env: + SONAR_SERVER_URL: "https://sonarcloud.io" + ORTOOLS_DIR: ${{ github.workspace }}/or-tools + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + + - name: Config OR-Tools URL + run: | + echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV + + - name: Install sonar-scanner and build-wrapper + uses: SonarSource/sonarcloud-github-c-cpp@v2 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: sonarcloud-${{ env.SONAR_SCANNER_VERSION }} + + - name: Install libraries + run: | + sudo apt-get update + sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev + sudo apt-get install libboost-test-dev + sudo apt-get install g++-10 gcc-10 + + - name: Read antares-deps version + id: antares-deps-version + uses: notiz-dev/github-action-json-property@release + with: + path: 'antares-deps-version.json' + prop_path: 'antares_deps_version' + + - name: Download pre-compiled librairies + uses: ./.github/workflows/download-extract-precompiled-libraries-tgz + with: + antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} + os: ${{matrix.os}} + buildtype: Debug + ortools-url: ${{env.ORTOOLS_URL}} + ortools-dir: ${{env.ORTOOLS_DIR}} + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: 3.12 + + - name: Install gcovr + run: sudo pip install gcovr==5.0 #5.1 generate issues with sonarcloud report parsing + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip3 install -r src/tests/examples/requirements.txt + + - name: Init submodule + run: | + git submodule update --init src/antares-deps + git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests + + - name: Configure + run: | + cmake -B _build -S src \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ + -DDEPS_INSTALL_DIR=./rte-antares-deps-Debug \ + -DCODE_COVERAGE=ON \ + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_PREFIX_PATH="../install;${{ env.ORTOOLS_DIR }}/install" \ + -DBUILD_TESTING=ON \ + -DMZ_CODE_COVERAGE=ON \ + -DBUILD_not_system=OFF \ + -DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}' + + - name: Build + run: | + build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/_build/output cmake --build _build --config release -j$(nproc) + + - name: Test and generate coverage + continue-on-error: true + run: | + cd $GITHUB_WORKSPACE/_build + ctest -C Release --output-on-failure -L "unit" + + - name: Collect coverage into one XML report + run: | + gcovr --sonarqube --output coverage.xml + + - name: Run sonar-scanner + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" From a914c32c1bbcd888d509ba5e8281e0c294ef13db Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 16:04:28 +0200 Subject: [PATCH 46/54] Fix windows workflow file Signed-off-by: Sylvain Leclerc --- .github/workflows/windows-vcpkg.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index a3665203d5..2954de007b 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -115,8 +115,6 @@ jobs: with: architecture: 'x64' python-version: '3.12' - cache: 'pip' - cache-dependency-path: 'requirements*.txt' - name: Install pip dependencies if necessary run: pip install -r src/tests/examples/requirements.txt @@ -318,11 +316,11 @@ jobs: cd _build cpack -G ZIP - - name: Installer upload - uses: actions/upload-artifact@v4 - with: - name: installer - path: _build/${{env.NSIS_NAME}} + - name: Installer upload + uses: actions/upload-artifact@v4 + with: + name: installer + path: _build/${{env.NSIS_NAME}} - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} From 40a9f3b8e17b6487179c2bfb587263c9943e9460 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Fri, 3 May 2024 19:08:00 +0200 Subject: [PATCH 47/54] VCPKG for sonar job Signed-off-by: Sylvain Leclerc --- .github/workflows/sonarcloud.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 9c061abe15..c48dc8e5a5 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -15,12 +15,26 @@ jobs: env: SONAR_SERVER_URL: "https://sonarcloud.io" ORTOOLS_DIR: ${{ github.workspace }}/or-tools + # Caching strategy of VCPKG dependencies + VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" steps: - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Install VCPKG + run: git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + + - name: Restore vcpkg binary dir from cache + id: cache-vcpkg-binary + uses: actions/cache/restore@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-ubuntu-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} + # Allows to restore a cache when deps have only partially changed (like adding a dependency) + restore-keys: vcpkg-cache-ubuntu- + - name: Config OR-Tools URL run: | echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV @@ -81,6 +95,7 @@ jobs: -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ + -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DDEPS_INSTALL_DIR=./rte-antares-deps-Debug \ -DCODE_COVERAGE=ON \ -DCMAKE_BUILD_TYPE=Debug \ @@ -109,3 +124,11 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" + + - name: Cache vcpkg binary dir + if: always() + id: save-cache-vcpkg-binary + uses: actions/cache/save@v4 + with: + path: ${{ github.workspace }}/vcpkg_cache + key: vcpkg-cache-ubuntu-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }} From d4924c9d3938e444cbefdb5a12b21503a579aad3 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Sat, 11 May 2024 14:16:49 +0200 Subject: [PATCH 48/54] Support minizip dependency as minizip or minizip-ng Signed-off-by: Sylvain Leclerc --- src/CMakeLists.txt | 12 +++++++++++- src/libs/antares/writer/CMakeLists.txt | 2 +- src/packaging/Config.cmake.in | 10 +++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f416eae357..30ed427827 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -280,7 +280,17 @@ message(STATUS "OR-Tools tag ${ORTOOLS_TAG}") FetchContent_MakeAvailable(ortools) endif() -find_package(minizip-ng REQUIRED) +find_package(minizip-ng) +if (minizip-ng_FOUND) + add_library(MINIZIP::minizip ALIAS MINIZIP::minizip-ng) +else () + find_package(minizip) + if (minizip_FOUND) + message (STATUS "Found minizip (not minizip-ng).") + else () + message (FATAL_ERROR "Minizip not found.") + endif () +endif () #wxWidget not needed for all library find is done in ui CMakeLists.txt if (VCPKG_TOOLCHAIN AND NOT BUILD_wxWidgets) diff --git a/src/libs/antares/writer/CMakeLists.txt b/src/libs/antares/writer/CMakeLists.txt index 8391ffc741..3bc675f96b 100644 --- a/src/libs/antares/writer/CMakeLists.txt +++ b/src/libs/antares/writer/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(result_writer Antares::benchmarking yuni-static-core PRIVATE - MINIZIP::minizip-ng + MINIZIP::minizip logs inifile io diff --git a/src/packaging/Config.cmake.in b/src/packaging/Config.cmake.in index dc37f5d9cd..2cbf63a275 100644 --- a/src/packaging/Config.cmake.in +++ b/src/packaging/Config.cmake.in @@ -1,8 +1,16 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(ortools) +find_dependency(ortools REQUIRED) find_dependency(minizip-ng) +if (minizip-ng_FOUND) + add_library(MINIZIP::minizip ALIAS MINIZIP::minizip-ng) +else () + find_dependency(minizip) + if (NOT minizip_FOUND) + message (FATAL_ERROR "Minizip dependency (minizip or minizip-ng) not found.") + endif () +endif () include("${CMAKE_CURRENT_LIST_DIR}/AntaresTargets.cmake") From 1b16bdae2888a56424bcca8a192024b6402b22a1 Mon Sep 17 00:00:00 2001 From: Florian OMNES <26088210+flomnes@users.noreply.github.com> Date: Tue, 14 May 2024 18:31:21 +0200 Subject: [PATCH 49/54] Empty commit to test GH caching From e2694b5e929c8921a3aa503d68fe53d7bc562643 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 16 May 2024 09:54:08 +0200 Subject: [PATCH 50/54] Add custom triplets to: - link statically with chosen libraries - build only release artifacts on CI Signed-off-by: Sylvain Leclerc --- .github/workflows/centos7.yml | 1 + .github/workflows/oracle8.yml | 1 + .github/workflows/sonarcloud.yml | 1 + .github/workflows/ubuntu.yml | 1 + .github/workflows/windows-vcpkg.yml | 2 +- src/triplets/x64-linux-antares.cmake | 5 +++++ src/triplets/x64-linux-release.cmake | 7 +++++++ src/triplets/x64-windows-antares.cmake | 13 +++++++++++++ src/triplets/x64-windows-release.cmake | 16 ++++++++++++++++ src/vcpkg.json | 3 +++ 10 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/triplets/x64-linux-antares.cmake create mode 100644 src/triplets/x64-linux-release.cmake create mode 100644 src/triplets/x64-windows-antares.cmake create mode 100644 src/triplets/x64-windows-release.cmake diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 81322b2f17..19f22c80d4 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -106,6 +106,7 @@ jobs: -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_TARGET_TRIPLET=x64-linux-release \ -DDEPS_INSTALL_DIR=/rte-antares-deps-Release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 23419028c0..d5d2946ce1 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -100,6 +100,7 @@ jobs: source /opt/rh/gcc-toolset-11/enable cmake -B _build -S src \ -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_TARGET_TRIPLET=x64-linux-release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index c48dc8e5a5..cf326c2d72 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -96,6 +96,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_TARGET_TRIPLET=x64-linux-release \ -DDEPS_INSTALL_DIR=./rte-antares-deps-Debug \ -DCODE_COVERAGE=ON \ -DCMAKE_BUILD_TYPE=Debug \ diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 518e93ffdf..96d18c1a4c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -115,6 +115,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_TARGET_TRIPLET=x64-linux-release \ -DDEPS_INSTALL_DIR=${{github.workspace}}/rte-antares-deps-Release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 2954de007b..4eb484b8d0 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -40,7 +40,7 @@ jobs: os: windows-latest test-platform: windows-2022 vcpkgPackages: wxwidgets boost-test - triplet: x64-windows + triplet: x64-windows-release # Caching strategy of VCPKG dependencies VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" diff --git a/src/triplets/x64-linux-antares.cmake b/src/triplets/x64-linux-antares.cmake new file mode 100644 index 0000000000..63954c80c5 --- /dev/null +++ b/src/triplets/x64-linux-antares.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + diff --git a/src/triplets/x64-linux-release.cmake b/src/triplets/x64-linux-release.cmake new file mode 100644 index 0000000000..c1c976603d --- /dev/null +++ b/src/triplets/x64-linux-release.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +# Avoid building debug artifacts +set(VCPKG_BUILD_TYPE Release) diff --git a/src/triplets/x64-windows-antares.cmake b/src/triplets/x64-windows-antares.cmake new file mode 100644 index 0000000000..42ed6dfa87 --- /dev/null +++ b/src/triplets/x64-windows-antares.cmake @@ -0,0 +1,13 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CMAKE_SYSTEM_NAME Windows) + +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +# Link zlib and minizip statically +list(APPEND STATIC_PORTS "zlib.*" "minizip.*") +foreach (STATIC_PORT IN LISTS STATIC_PORTS) + if(PORT MATCHES ${STATIC_PORT}) + set(VCPKG_LIBRARY_LINKAGE static) + endif() +endforeach () diff --git a/src/triplets/x64-windows-release.cmake b/src/triplets/x64-windows-release.cmake new file mode 100644 index 0000000000..d31cb8c7ac --- /dev/null +++ b/src/triplets/x64-windows-release.cmake @@ -0,0 +1,16 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CMAKE_SYSTEM_NAME Windows) + +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +# Avoid building debug artifacts +set(VCPKG_BUILD_TYPE Release) + +# Link zlib and minizip statically +list(APPEND STATIC_PORTS "zlib.*" "minizip.*") +foreach (STATIC_PORT IN LISTS STATIC_PORTS) + if(PORT MATCHES ${STATIC_PORT}) + set(VCPKG_LIBRARY_LINKAGE static) + endif() +endforeach () diff --git a/src/vcpkg.json b/src/vcpkg.json index a8e0e38c22..eead5a395a 100644 --- a/src/vcpkg.json +++ b/src/vcpkg.json @@ -1,6 +1,9 @@ { "name": "antares-simulator", "version-string": "9.1.0", + "vcpkg-configuration": { + "overlay-triplets": [ "./triplets" ] + }, "dependencies": [ { "name": "wxwidgets", From e526cba250b7ec24eb3214ac4a51c7495196da29 Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 16 May 2024 11:15:09 +0200 Subject: [PATCH 51/54] Fix build type in triplets Signed-off-by: Sylvain Leclerc --- src/triplets/x64-linux-release.cmake | 2 +- src/triplets/x64-windows-release.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/triplets/x64-linux-release.cmake b/src/triplets/x64-linux-release.cmake index c1c976603d..d9eb98ddae 100644 --- a/src/triplets/x64-linux-release.cmake +++ b/src/triplets/x64-linux-release.cmake @@ -4,4 +4,4 @@ set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) # Avoid building debug artifacts -set(VCPKG_BUILD_TYPE Release) +set(VCPKG_BUILD_TYPE release) diff --git a/src/triplets/x64-windows-release.cmake b/src/triplets/x64-windows-release.cmake index d31cb8c7ac..6eca73432a 100644 --- a/src/triplets/x64-windows-release.cmake +++ b/src/triplets/x64-windows-release.cmake @@ -5,7 +5,7 @@ set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) # Avoid building debug artifacts -set(VCPKG_BUILD_TYPE Release) +set(VCPKG_BUILD_TYPE release) # Link zlib and minizip statically list(APPEND STATIC_PORTS "zlib.*" "minizip.*") From 5bc828e8b07fc59947ff6813444a19172580afde Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Thu, 16 May 2024 13:30:06 +0200 Subject: [PATCH 52/54] Fix windows triplets Signed-off-by: Sylvain Leclerc --- src/triplets/x64-windows-antares.cmake | 2 -- src/triplets/x64-windows-release.cmake | 1 - 2 files changed, 3 deletions(-) diff --git a/src/triplets/x64-windows-antares.cmake b/src/triplets/x64-windows-antares.cmake index 42ed6dfa87..f2480f7012 100644 --- a/src/triplets/x64-windows-antares.cmake +++ b/src/triplets/x64-windows-antares.cmake @@ -1,6 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CMAKE_SYSTEM_NAME Windows) - set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/src/triplets/x64-windows-release.cmake b/src/triplets/x64-windows-release.cmake index 6eca73432a..7e4eb27f4d 100644 --- a/src/triplets/x64-windows-release.cmake +++ b/src/triplets/x64-windows-release.cmake @@ -1,5 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CMAKE_SYSTEM_NAME Windows) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) From f2546c4f9483603ad70b209900b5cec2dc77024f Mon Sep 17 00:00:00 2001 From: Jason Marechal Date: Wed, 29 May 2024 15:08:28 +0200 Subject: [PATCH 53/54] Boost available on linux too --- src/vcpkg.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vcpkg.json b/src/vcpkg.json index eead5a395a..e3f258a01a 100644 --- a/src/vcpkg.json +++ b/src/vcpkg.json @@ -2,7 +2,9 @@ "name": "antares-simulator", "version-string": "9.1.0", "vcpkg-configuration": { - "overlay-triplets": [ "./triplets" ] + "overlay-triplets": [ + "./triplets" + ] }, "dependencies": [ { @@ -10,12 +12,10 @@ "platform": "windows" }, { - "name": "boost-test", - "platform": "windows" + "name": "boost-test" }, { - "name": "boost-algorithm", - "platform": "windows" + "name": "boost-algorithm" }, { "name": "minizip-ng", From 38c49f6a517ebf18e0918c908f785a30a3497c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20Mar=C3=A9chal?= <45510813+JasonMarechal25@users.noreply.github.com> Date: Thu, 30 May 2024 11:37:02 +0200 Subject: [PATCH 54/54] Feature/vcpkg linux fixes (#2127) - Define minimal version for boost and minizip - remove BOOST_TEST_DYN_LINK --------- Co-authored-by: Florian OMNES --- .../test_binding_constraints.cpp | 40 +++++++++--------- .../end-to-end/simple_study/simple-study.cpp | 40 +++++++++--------- .../libs/antares/array/tests-matrix-load.cpp | 38 ++++++++--------- .../libs/antares/array/tests-matrix-save.cpp | 38 ++++++++--------- .../benchmarking/test_duration_collector.cpp | 38 ++++++++--------- .../antares/concurrency/test_concurrency.cpp | 41 +++++++++---------- .../area/test-save-area-optimization-ini.cpp | 38 ++++++++--------- .../study/area/test-save-link-properties.cpp | 38 ++++++++--------- .../study/constraint/test_constraint.cpp | 38 ++++++++--------- .../antares/study/constraint/test_group.cpp | 38 ++++++++--------- .../antares/study/output-folder/study.cpp | 38 ++++++++--------- .../study/parameters/parameters-tests.cpp | 38 ++++++++--------- .../study/parts/hydro/test-hydro-series.cpp | 21 ++++++++++ .../parts/hydro/test-hydroreader-class.cpp | 21 ++++++++++ .../test-sc-builder-file-read-line.cpp | 38 ++++++++--------- .../test-sc-builder-file-save.cpp | 38 ++++++++--------- .../antares/study/series/timeseries-tests.cpp | 38 ++++++++--------- .../short-term-storage-input-output.cpp | 38 ++++++++--------- .../src/libs/antares/study/test_study.cpp | 38 ++++++++--------- .../thermal-price-definition.cpp | 38 ++++++++--------- src/tests/src/libs/antares/test_utils.cpp | 38 ++++++++--------- .../src/libs/antares/writer/CMakeLists.txt | 10 ++--- .../src/libs/antares/writer/test_writer.cpp | 40 +++++++++--------- .../test-unfeasible-problem-analyzer.cpp | 2 - .../solver/optimisation/adequacy_patch.cpp | 38 ++++++++--------- .../test-store-timeseries-number.cpp | 38 ++++++++--------- .../solver/simulation/test-time_series.cpp | 38 ++++++++--------- .../solver/simulation/tests-ts-numbers.cpp | 38 ++++++++--------- src/tests/src/solver/utils/basis_status.cpp | 38 ++++++++--------- src/vcpkg.json | 8 +++- 30 files changed, 528 insertions(+), 493 deletions(-) diff --git a/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp b/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp index a40157091a..c1b875378f 100644 --- a/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp +++ b/src/tests/end-to-end/binding_constraints/test_binding_constraints.cpp @@ -1,25 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ -#include // Fix for Boost < 1.67 - + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test - end - to - end tests_binding_constraints #define WIN32_LEAN_AND_MEAN #include diff --git a/src/tests/end-to-end/simple_study/simple-study.cpp b/src/tests/end-to-end/simple_study/simple-study.cpp index 5c9181ddbf..e5813befd8 100644 --- a/src/tests/end-to-end/simple_study/simple-study.cpp +++ b/src/tests/end-to-end/simple_study/simple-study.cpp @@ -1,25 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ -#include // Fix for Boost < 1.67 - + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test - end - to - end tests #include #include diff --git a/src/tests/src/libs/antares/array/tests-matrix-load.cpp b/src/tests/src/libs/antares/array/tests-matrix-load.cpp index 1dfecf1517..2c427890eb 100644 --- a/src/tests/src/libs/antares/array/tests-matrix-load.cpp +++ b/src/tests/src/libs/antares/array/tests-matrix-load.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test - lib - antares - matrix tests #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/array/tests-matrix-save.cpp b/src/tests/src/libs/antares/array/tests-matrix-save.cpp index 13560a047e..d1af11d387 100644 --- a/src/tests/src/libs/antares/array/tests-matrix-save.cpp +++ b/src/tests/src/libs/antares/array/tests-matrix-save.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test - lib - antares - matrix tests #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/benchmarking/test_duration_collector.cpp b/src/tests/src/libs/antares/benchmarking/test_duration_collector.cpp index d213dc64d5..4fc74bcda9 100644 --- a/src/tests/src/libs/antares/benchmarking/test_duration_collector.cpp +++ b/src/tests/src/libs/antares/benchmarking/test_duration_collector.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test - benchmarking #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/concurrency/test_concurrency.cpp b/src/tests/src/libs/antares/concurrency/test_concurrency.cpp index 26923159c7..c1188c7a9d 100644 --- a/src/tests/src/libs/antares/concurrency/test_concurrency.cpp +++ b/src/tests/src/libs/antares/concurrency/test_concurrency.cpp @@ -1,27 +1,24 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ -#include // Fix for Boost < 1.67 - + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test - concurrency tests - #include #include diff --git a/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp b/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp index 40fcb4b5fd..77672b88c2 100644 --- a/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp +++ b/src/tests/src/libs/antares/study/area/test-save-area-optimization-ini.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test save area optimization.ini #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp b/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp index af30689f4b..305241cd3e 100644 --- a/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp +++ b/src/tests/src/libs/antares/study/area/test-save-link-properties.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test save link properties.ini #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/constraint/test_constraint.cpp b/src/tests/src/libs/antares/study/constraint/test_constraint.cpp index 25322ae361..e6e5cd54c3 100644 --- a/src/tests/src/libs/antares/study/constraint/test_constraint.cpp +++ b/src/tests/src/libs/antares/study/constraint/test_constraint.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ // // Created by marechaljas on 13/03/23. // diff --git a/src/tests/src/libs/antares/study/constraint/test_group.cpp b/src/tests/src/libs/antares/study/constraint/test_group.cpp index 3e87707fe2..21f5c7377a 100644 --- a/src/tests/src/libs/antares/study/constraint/test_group.cpp +++ b/src/tests/src/libs/antares/study/constraint/test_group.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ // // Created by marechaljas on 28/06/23. // diff --git a/src/tests/src/libs/antares/study/output-folder/study.cpp b/src/tests/src/libs/antares/study/output-folder/study.cpp index eba613c781..1675ae7909 100644 --- a/src/tests/src/libs/antares/study/output-folder/study.cpp +++ b/src/tests/src/libs/antares/study/output-folder/study.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE output folder #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/parameters/parameters-tests.cpp b/src/tests/src/libs/antares/study/parameters/parameters-tests.cpp index 3dde6f5784..f690649668 100644 --- a/src/tests/src/libs/antares/study/parameters/parameters-tests.cpp +++ b/src/tests/src/libs/antares/study/parameters/parameters-tests.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE "test parameters" #include diff --git a/src/tests/src/libs/antares/study/parts/hydro/test-hydro-series.cpp b/src/tests/src/libs/antares/study/parts/hydro/test-hydro-series.cpp index 9e28c98df0..d534ca7d53 100644 --- a/src/tests/src/libs/antares/study/parts/hydro/test-hydro-series.cpp +++ b/src/tests/src/libs/antares/study/parts/hydro/test-hydro-series.cpp @@ -1,3 +1,24 @@ +/* + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ + #define BOOST_TEST_MODULE test hydro series #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/parts/hydro/test-hydroreader-class.cpp b/src/tests/src/libs/antares/study/parts/hydro/test-hydroreader-class.cpp index a933b5a3c0..cf519c3cb7 100644 --- a/src/tests/src/libs/antares/study/parts/hydro/test-hydroreader-class.cpp +++ b/src/tests/src/libs/antares/study/parts/hydro/test-hydroreader-class.cpp @@ -1,3 +1,24 @@ +/* + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ + #define BOOST_TEST_MODULE test hydro reader #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp index 003a24b22a..36346b2014 100644 --- a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp +++ b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test read scenario - builder.dat #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp index b0fd157f03..e1b0666b7d 100644 --- a/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp +++ b/src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test save scenario - builder.dat #include #include diff --git a/src/tests/src/libs/antares/study/series/timeseries-tests.cpp b/src/tests/src/libs/antares/study/series/timeseries-tests.cpp index 4e49aea134..4908d10601 100644 --- a/src/tests/src/libs/antares/study/series/timeseries-tests.cpp +++ b/src/tests/src/libs/antares/study/series/timeseries-tests.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE "test time series" #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp b/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp index fed4f02570..83965049e6 100644 --- a/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp +++ b/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE "test short term storage" #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/test_study.cpp b/src/tests/src/libs/antares/study/test_study.cpp index 77c30ed914..104b304c0e 100644 --- a/src/tests/src/libs/antares/study/test_study.cpp +++ b/src/tests/src/libs/antares/study/test_study.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE study #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp b/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp index e2473fc986..cfef5909e5 100644 --- a/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp +++ b/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE "test thermal price definition" #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/libs/antares/test_utils.cpp b/src/tests/src/libs/antares/test_utils.cpp index 9e101e34a3..ad7e97d833 100644 --- a/src/tests/src/libs/antares/test_utils.cpp +++ b/src/tests/src/libs/antares/test_utils.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test utils #include diff --git a/src/tests/src/libs/antares/writer/CMakeLists.txt b/src/tests/src/libs/antares/writer/CMakeLists.txt index 5be6927039..b85bcce05c 100644 --- a/src/tests/src/libs/antares/writer/CMakeLists.txt +++ b/src/tests/src/libs/antares/writer/CMakeLists.txt @@ -2,11 +2,11 @@ add_executable(test-writer test_writer.cpp) target_link_libraries(test-writer - PRIVATE - Boost::unit_test_framework - Antares::result_writer - test_utils_unit - MINIZIP::minizip-ng + PRIVATE + Boost::unit_test_framework + Antares::result_writer + test_utils_unit + MINIZIP::minizip ) set_target_properties(test-writer PROPERTIES FOLDER Unit-tests/test-writer) diff --git a/src/tests/src/libs/antares/writer/test_writer.cpp b/src/tests/src/libs/antares/writer/test_writer.cpp index 3a87905607..e3af61cc44 100644 --- a/src/tests/src/libs/antares/writer/test_writer.cpp +++ b/src/tests/src/libs/antares/writer/test_writer.cpp @@ -1,25 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ -#include // Fix for Boost < 1.67 - + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test - writer tests #include #include diff --git a/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp b/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp index 8d56ec12f2..d333f5104c 100644 --- a/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp +++ b/src/tests/src/solver/infeasible-problem-analysis/test-unfeasible-problem-analyzer.cpp @@ -18,8 +18,6 @@ * You should have received a copy of the Mozilla Public Licence 2.0 * along with Antares_Simulator. If not, see . */ -#include // Fix for Boost < 1.67 - #define WIN32_LEAN_AND_MEAN #define BOOST_TEST_MODULE unfeasible_problem_analyzer diff --git a/src/tests/src/solver/optimisation/adequacy_patch.cpp b/src/tests/src/solver/optimisation/adequacy_patch.cpp index 6234cc1c65..377969fd5d 100644 --- a/src/tests/src/solver/optimisation/adequacy_patch.cpp +++ b/src/tests/src/solver/optimisation/adequacy_patch.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test adequacy patch functions #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/solver/simulation/test-store-timeseries-number.cpp b/src/tests/src/solver/simulation/test-store-timeseries-number.cpp index 1524b26627..16cbb59fc2 100644 --- a/src/tests/src/solver/simulation/test-store-timeseries-number.cpp +++ b/src/tests/src/solver/simulation/test-store-timeseries-number.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ // // Created by marechaljas on 15/03/23. // diff --git a/src/tests/src/solver/simulation/test-time_series.cpp b/src/tests/src/solver/simulation/test-time_series.cpp index 5c9fdfa942..42f1fbddf4 100644 --- a/src/tests/src/solver/simulation/test-time_series.cpp +++ b/src/tests/src/solver/simulation/test-time_series.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ // // Created by marechaljas on 07/04/23. // diff --git a/src/tests/src/solver/simulation/tests-ts-numbers.cpp b/src/tests/src/solver/simulation/tests-ts-numbers.cpp index a6ecf820c1..e82d432121 100644 --- a/src/tests/src/solver/simulation/tests-ts-numbers.cpp +++ b/src/tests/src/solver/simulation/tests-ts-numbers.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test solver simulation things #define WIN32_LEAN_AND_MEAN diff --git a/src/tests/src/solver/utils/basis_status.cpp b/src/tests/src/solver/utils/basis_status.cpp index b4994b28dc..292dc56c3c 100644 --- a/src/tests/src/solver/utils/basis_status.cpp +++ b/src/tests/src/solver/utils/basis_status.cpp @@ -1,23 +1,23 @@ /* -** Copyright 2007-2024, RTE (https://www.rte-france.com) -** See AUTHORS.txt -** SPDX-License-Identifier: MPL-2.0 -** This file is part of Antares-Simulator, -** Adequacy and Performance assessment for interconnected energy networks. -** -** Antares_Simulator is free software: you can redistribute it and/or modify -** it under the terms of the Mozilla Public Licence 2.0 as published by -** the Mozilla Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** Antares_Simulator is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** Mozilla Public Licence 2.0 for more details. -** -** You should have received a copy of the Mozilla Public Licence 2.0 -** along with Antares_Simulator. If not, see . -*/ + * Copyright 2007-2024, RTE (https://www.rte-france.com) + * See AUTHORS.txt + * SPDX-License-Identifier: MPL-2.0 + * This file is part of Antares-Simulator, + * Adequacy and Performance assessment for interconnected energy networks. + * + * Antares_Simulator is free software: you can redistribute it and/or modify + * it under the terms of the Mozilla Public Licence 2.0 as published by + * the Mozilla Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * Antares_Simulator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Mozilla Public Licence 2.0 for more details. + * + * You should have received a copy of the Mozilla Public Licence 2.0 + * along with Antares_Simulator. If not, see . + */ #define BOOST_TEST_MODULE test adequacy patch functions #define WIN32_LEAN_AND_MEAN diff --git a/src/vcpkg.json b/src/vcpkg.json index e3f258a01a..f15f208a42 100644 --- a/src/vcpkg.json +++ b/src/vcpkg.json @@ -1,6 +1,7 @@ { "name": "antares-simulator", "version-string": "9.1.0", + "builtin-baseline": "9484a57dd560b89f0a583be08af6753611c57fd5", "vcpkg-configuration": { "overlay-triplets": [ "./triplets" @@ -12,14 +13,17 @@ "platform": "windows" }, { - "name": "boost-test" + "name": "boost-test", + "version>=": "1.81.0" }, { - "name": "boost-algorithm" + "name": "boost-algorithm", + "version>=": "1.81.0" }, { "name": "minizip-ng", "default-features": false, + "version>=": "4.0.0", "features": [ "zlib" ]