Merge branch 'AntaresSimulatorTeam:develop' into develop

.github/workflows/centos7.yml

@@ -72,7 +72,7 @@ jobs:
       run: |
            source /opt/rh/devtoolset-9/enable
            source /opt/rh/rh-git227/enable
-           cmake3 --build _build --config Release -j2
+           cmake3 --build _build --config Release -j$(nproc)
            ccache -s
 
     - name: Installer .rpm creation

.github/workflows/doxygen.yml

@@ -0,0 +1,43 @@
+name: GitHub Pages
+
+on:
+  push:
+    branches:
+      - develop  # Set a branch name to trigger deployment
+
+jobs:
+  deploy:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true  # Fetch Hugo themes (true OR recursive)
+          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
+
+      - name: theme
+        run: |
+             git clone https://github.com/jothepro/doxygen-awesome-css.git
+             cd doxygen-awesome-css
+             git checkout v2.2.1
+             
+      - name: Doxygen
+        uses: mattnotmitt/[email protected]
+        with:
+          doxyfile-path:  docs/Doxyfile
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        # If you're changing the branch from main,
+        # also change the `main` in `refs/heads/main`
+        # below accordingly.
+        if: github.ref == 'refs/heads/develop'
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./html
+
+
+

.github/workflows/oracle8.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Install libraries
       run: |
            dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core
-           dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain
+           dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain zlib-devel
 
     - name: Checkout
       run: |
@@ -61,7 +61,7 @@ jobs:
     - name: Build
       run: |
            source /opt/rh/gcc-toolset-9/enable
-           cmake --build _build --config Release -j2
+           cmake --build _build --config Release -j$(nproc)
 
     - name: Run unit and end-to-end tests
       if: ${{ env.IS_PUSH == 'true' }}

.github/workflows/sonarcloud.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: Install gcovr
         run: sudo pip install gcovr==5.0 #5.1 generate issues with sonarcloud report parsing
@@ -86,7 +86,8 @@ jobs:
              -DCMAKE_PREFIX_PATH="../install;${{ env.ORTOOLS_DIR }}/install" \
              -DBUILD_TESTING=ON \
              -DMZ_CODE_COVERAGE=ON \
-             -DBUILD_not_system=OFF
+             -DBUILD_not_system=OFF \
+             -DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'
 
       - name: Build
         run: |

.github/workflows/ubuntu.yml

@@ -73,9 +73,10 @@ jobs:
         ortools-dir: ${{env.ORTOOLS_DIR}}
 
     - name: Set up Python
+      id: setup-python
       uses: actions/setup-python@v4
       with:
-        python-version: 3.x
+        python-version: '3.12'
 
     - name: Install dependencies
       run: |
@@ -87,7 +88,7 @@ jobs:
           git submodule update --init src/antares-deps
           git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests
 
-    - name: Configure push
+    - name: Configure
       run: |
            cmake -B _build -S src \
            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
@@ -98,10 +99,11 @@ jobs:
            -DBUILD_not_system=OFF \
            -DBUILD_TOOLS=ON \
            -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install \
+           -DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'
 
     - name: Build
       run: |
-             cmake --build _build --config release -j2
+             cmake --build _build --config release -j$(nproc)
 
 
     # simtest
@@ -112,6 +114,7 @@ jobs:
         path: 'simtest.json'
         prop_path: 'version'
 
+
     - name: Run named mps tests
       if: ${{ env.IS_PUSH == 'true' }}
       uses: ./.github/workflows/run-tests
@@ -125,7 +128,7 @@ jobs:
       if: ${{ env.IS_PUSH == 'true' }}
       run: |
            cd _build
-           ctest -C Release --output-on-failure -R unfeasible
+           ctest -C Release --output-on-failure -R "^unfeasible$"
 
     - name: Run unit and end-to-end tests
       if: ${{ env.IS_PUSH == 'true' }}
@@ -164,6 +167,23 @@ jobs:
         batch-name: valid-v860
         os: ${{ matrix.test-platform }}
 
+    - name: Run tests introduced in v870
+      if: ${{ env.IS_PUSH == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-v870
+        os: ${{ matrix.test-platform }}
+
+    - name: Run parallel tests
+      if: ${{ env.IS_PUSH == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-parallel
+        os: ${{ matrix.test-platform }}
+        variant: "parallel"
+
     - name: Run short-tests
       if: ${{ env.IS_PUSH == 'true' }}
       uses: ./.github/workflows/run-tests

.github/workflows/windows-release.yml

@@ -51,7 +51,7 @@ jobs:
       uses: actions/setup-python@v4
       with:
         architecture: 'x64'
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name : Install deps with VCPKG
       run: |
@@ -99,7 +99,8 @@ jobs:
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON  \
            -DBUILD_TOOLS=ON \
-           -DBUILD_not_system=OFF
+           -DBUILD_not_system=OFF \
+           -DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'
 
     - name: Build
       run: |

.github/workflows/windows-vcpkg.yml

@@ -41,6 +41,24 @@ jobs:
       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/[email protected]
+      with:
+        key: windows
+
     - name : Init VCPKG submodule
       run: |
           git submodule update --init vcpkg
@@ -85,11 +103,12 @@ jobs:
         ortools-url: ${{env.ORTOOLS_URL}}
         ortools-dir: ${{env.ORTOOLS_DIR}}
 
-    - name: Setup Python 3.11
+    - name: Setup Python 3.12
       uses: actions/setup-python@v4
+      id: setup-python
       with:
         architecture: 'x64'
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install pip dependencies if necessary
       run: pip install -r src/tests/examples/requirements.txt
@@ -113,7 +132,9 @@ jobs:
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON  \
            -DBUILD_TOOLS=ON \
-           -DBUILD_not_system=OFF
+           -DBUILD_not_system=OFF \
+           -DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}' \
+           -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle"
 
     - name: Build
       shell: bash
@@ -123,7 +144,7 @@ jobs:
     - name: Run unfeasibility-related tests
       run: |
            cd _build
-           ctest -C Release --output-on-failure -R unfeasible
+           ctest -C Release --output-on-failure -R "^unfeasible$"
 
     - name: Run unit and end-to-end tests
       run: |
@@ -182,6 +203,23 @@ jobs:
         batch-name: valid-v860
         os: ${{ matrix.test-platform }}
 
+    - name: Run tests introduced in v870
+      if: ${{ env.IS_PUSH == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-v870
+        os: ${{ matrix.test-platform }}
+
+    - name: Run parallel tests
+      if: ${{ env.IS_PUSH == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-parallel
+        os: ${{ matrix.test-platform }}
+        variant: "parallel"
+
     - name: Run short-tests
       uses: ./.github/workflows/run-tests
       with:

README.md

@@ -22,6 +22,8 @@ Until 2018 it was distributed under the terms of a proprietary license.
 
 In May 2018 RTE decided to release the project under the GPLv3 license.
 
+The GUI is deprecated in favor of [Antares Web](https://github.com/AntaresSimulatorTeam/AntaREST).
+
 [linux_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Linux%20CI%20(system%20libs)/badge.svg
 
 [linux_system_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Linux%20CI%20(system%20libs)"
@@ -39,6 +41,8 @@ In May 2018 RTE decided to release the project under the GPLv3 license.
 
 - Antares web site :  https://antares-simulator.org
 - RTE web site  : http://www.rte-france.com/
+- Doxygen code documentation  : https://antaressimulatorteam.github.io/Antares_Simulator/
+- Antares Web : https://github.com/AntaresSimulatorTeam/AntaREST
 
 
 # Installation