From b4020a0309ecd6e50e099321008567d637d2ce4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jason=20Mar=C3=A9chal?=
 <45510813+JasonMarechal25@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:10:16 +0200
Subject: [PATCH] Merge workflow to have only one for each platform (#839)

Merge release and build workflows.
Now only one workflow where _userguide_ and _release_ jobs are called
only on release event

- Remove "xpress" qualifier from assets
- Properly use vcpkg and cache its cache. No more manual installed.
Install is done at configure time.
- Build job always generate assets. Avoid requiring a release run to
test assets

---------

Co-authored-by: abdoulbari zaher <32519851+a-zakir@users.noreply.github.com>
---
 .github/workflows/build_centos7.yml           | 153 +++++++--
 .github/workflows/build_oracle8.yml           | 128 ++++++-
 .github/workflows/build_ubuntu.yml            | 134 +++++++-
 .github/workflows/build_windows.yml           | 170 +++++++---
 .github/workflows/centos-release.yml          | 321 ------------------
 .github/workflows/ol8-release.yml             | 284 ----------------
 .github/workflows/sonarcloud.yml              |  25 ++
 .github/workflows/ubuntu-release.yml          | 251 --------------
 .../workflows/ubuntu-system-deps-build.yml    |  26 +-
 .../workflows/windows-vcpkg-deps-build.yml    |  47 ++-
 .github/workflows/windows-vcpkg.yml           | 284 ----------------
 vcpkg                                         |   2 +-
 vcpkg.json                                    |   2 +-
 13 files changed, 579 insertions(+), 1248 deletions(-)
 delete mode 100644 .github/workflows/centos-release.yml
 delete mode 100644 .github/workflows/ol8-release.yml
 delete mode 100644 .github/workflows/ubuntu-release.yml
 delete mode 100644 .github/workflows/windows-vcpkg.yml

diff --git a/.github/workflows/build_centos7.yml b/.github/workflows/build_centos7.yml
index 3f3bd7b11..d27d29175 100644
--- a/.github/workflows/build_centos7.yml
+++ b/.github/workflows/build_centos7.yml
@@ -89,6 +89,10 @@ jobs:
       XPRS_LIB_Path_CONTAINER: ${GITHUB_WORKSPACE}/xpress/lib
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
 
+    outputs:
+      TGZ_NAME: ${{ steps.export_output.outputs.TGZ_NAME }}
+      SINGLE_FILE_NAME: ${{ steps.export_output.outputs.SINGLE_FILE_NAME }}
+
     steps:
       - run: |
           source /opt/rh/devtoolset-10/enable
@@ -128,23 +132,6 @@ jobs:
           ref: ${{matrix.xprs.ref}}
         if: matrix.xprs.value == 'XPRESS-ON'
 
-      - name: Restore vcpkg and its artifacts.
-        uses: actions/cache@v3
-        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 termporary 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.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}
-
-
       - name: Download pre-compiled librairies
         uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
         with:
@@ -163,17 +150,26 @@ jobs:
           pip3 install -r requirements-tests.txt
           pip3 install -r requirements-ui.txt
 
+      - run: |
+          mkdir -p ${{ github.workspace }}/vcpkg_cache
+
       - name: vcpkg install
         run: |
           pushd vcpkg
           git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
+          ./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-centOS-${{ 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-centOS-
 
       - name: Configure
         run: |
-          [[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
           source /opt/rh/devtoolset-10/enable
           cmake -B _build -S . \
                  -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
@@ -181,7 +177,6 @@ jobs:
                  -DCMAKE_BUILD_TYPE=Release \
                  -DCMAKE_INSTALL_PREFIX=_install \
                  -DBUILD_UI=ON \
-                 -DXPRESS=${{ env.XPRESS_VALUE }} \
                  -DALLOW_RUN_AS_ROOT=ON \
                  -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 
@@ -189,12 +184,124 @@ jobs:
         run: |
           cmake --build _build --config Release -j$(nproc)
 
+      - 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-centOS-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
+
       - name: Running unit tests
         timeout-minutes: 120
         shell: bash
         run: |
-          export PATH=${GITHUB_WORKSPACE}/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
+          export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
           export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }}
           export XPRESS=${{ env.XPRESS_CONTAINER }}
           cd _build
           ctest -C Release --output-on-failure -L "unit|benders|lpnamer|medium"
+
+      #######################
+      - name: Install
+        run: |
+          cd _build
+          cmake --install .
+
+      - id: create-single-file
+        name: Single file .tar.gz creation
+        uses: ./.github/workflows/single-file-creation-tgz
+        with:
+          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+
+      - name: Installer .tar.gz creation
+        run: |
+          cd _build
+          export FILE_NAME="antaresXpansion-${{steps.antares-xpansion-version.outputs.result}}-CentOS-7.9.2009"
+          cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=$FILE_NAME
+          #Need to differentiate between xpress/no_xpress files
+          #Cpack command line doesn't seem to care about -P or -R options
+          echo "TGZ_NAME=$FILE_NAME.tar.gz" >> $GITHUB_ENV
+
+      - name: Upload .tar.gz
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{env.TGZ_NAME}}
+          path: _build/${{env.TGZ_NAME}}
+
+      - name: Upload single file
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.create-single-file.outputs.archive-name }}
+          path: ${{ steps.create-single-file.outputs.archive-path }}
+
+      - name: export asset name in output
+        id: export_output
+        run: |
+          echo "TGZ_NAME=${{env.TGZ_NAME}}" >> $GITHUB_OUTPUT
+          echo "SINGLE_FILE_NAME=${{ steps.create-single-file.outputs.archive-name }}" >> $GITHUB_OUTPUT
+
+      #######################
+  userguide:
+    if: github.event_name == 'release' && github.event.action == 'created'
+    runs-on: ubuntu-latest
+    outputs:
+      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Read antares-xpansion version
+        id: antares-xpansion-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_xpansion_version'
+
+      - id: create-user-guide
+        name: user guide pdf creation
+        uses: ./.github/workflows/generate-userguide-pdf
+        with:
+          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+
+      - name: user guide upload
+        id: userguide_upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: user-guide
+          path: ${{ steps.create-user-guide.outputs.pdf-path }}
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [ build, userguide ]
+    if: github.event_name == 'release' && github.event.action == 'created'
+    steps:
+      - name: Download userguide
+        uses: actions/download-artifact@v4
+        with:
+          name: user-guide
+          path: docs/
+
+      - name: Download build assets
+        uses: actions/download-artifact@v3 #build use v3
+        with:
+          name: ${{needs.build.outputs.TGZ_NAME}}
+          path: _build/
+
+      - name: Download build assets single file
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{needs.build.outputs.SINGLE_FILE_NAME}}
+          path: .
+
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@main
+
+      - name: Upload Release Asset
+        env:
+          GH_REPO: ${{ github.repository }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} _build/${{needs.build.outputs.TGZ_NAME}}
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{needs.build.outputs.SINGLE_FILE_NAME}}
\ No newline at end of file
diff --git a/.github/workflows/build_oracle8.yml b/.github/workflows/build_oracle8.yml
index b9f6f2147..6dff766cf 100644
--- a/.github/workflows/build_oracle8.yml
+++ b/.github/workflows/build_oracle8.yml
@@ -63,6 +63,10 @@ jobs:
       XPRESS_CONTAINER: ${GITHUB_WORKSPACE}/xpress/bin
       XPRS_LIB_Path_CONTAINER: ${GITHUB_WORKSPACE}/xpress/lib
 
+    outputs:
+      zip_name: ${{ steps.zip_name.outputs.zip_name }}
+      singlefile_name: ${{ steps.zip_name.outputs.singlefile_name }}
+
     steps:
       - name: Install System
         run: |
@@ -119,20 +123,25 @@ jobs:
         run: |
           pushd vcpkg
           git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
+          ./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-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-
 
       - name: Configure
         run: |
-          [[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
           cmake -B _build -S . \
                  -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
                  -DBUILD_TESTING=ON \
                  -DCMAKE_BUILD_TYPE=Release \
                  -DCMAKE_INSTALL_PREFIX=_install \
                  -DBUILD_UI=OFF \
-                 -DXPRESS=${{ env.XPRESS_VALUE }} \
                  -DALLOW_RUN_AS_ROOT=ON \
                  -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 
@@ -144,8 +153,115 @@ jobs:
         timeout-minutes: 120
         shell: bash
         run: |
-          export PATH=${GITHUB_WORKSPACE}/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
+          export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
           export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }}
           export XPRESS=${{ env.XPRESS_CONTAINER }}
           cd _build
           ctest -C Release --output-on-failure -L "unit|benders|lpnamer|medium"
+          
+      - 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-oracle8-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
+
+      #######################
+      - name: Install
+        run: |
+          cd _build
+          cmake --install .
+          
+      - name: .tar.gz creation
+        run: |
+          cd _build
+          export FILE_NAME="antaresXpansion-${{needs.versions.outputs.antares-xpansion-version}}-OracleServer-8.9"
+          cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=$FILE_NAME
+          echo "TGZ_NAME=$FILE_NAME.tar.gz" >> $GITHUB_ENV
+
+      - name: Upload .tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.TGZ_NAME}}
+          path: _build/${{env.TGZ_NAME}}
+
+      - id: create-single-file
+        name: Single file .tar.gz creation
+        uses: ./.github/workflows/single-file-creation-tgz
+        with:
+          antares-xpansion-version: ${{needs.versions.outputs.antares-xpansion-version}}
+
+      - name: Upload single file
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.create-single-file.outputs.archive-name }}
+          path: ${{ steps.create-single-file.outputs.archive-path }}
+
+      - id: zip_name
+        run: |
+          echo "singlefile_name=${{steps.create-single-file.outputs.archive-name}}" >> "$GITHUB_OUTPUT"
+          echo "zip_name=${{env.TGZ_NAME}}" >> "$GITHUB_OUTPUT"
+      #######################
+  userguide:
+    if: github.event_name == 'release' && github.event.action == 'created'
+    runs-on: ubuntu-latest
+    outputs:
+      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Read antares-xpansion version
+        id: antares-xpansion-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_xpansion_version'
+
+      - id: create-user-guide
+        name: user guide pdf creation
+        uses: ./.github/workflows/generate-userguide-pdf
+        with:
+          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+
+      - name: user guide upload
+        id: userguide_upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: user-guide
+          path: ${{ steps.create-user-guide.outputs.pdf-path }}
+
+  upload_asset_to_release:
+    if: github.event_name == 'release' && github.event.action == 'created'
+    runs-on: ubuntu-latest
+    needs: [build, userguide]
+    env:
+      ZIP_NAME: ${{needs.build.outputs.zip_name}}
+      SINGLEFILE_NAME: ${{needs.build.outputs.singlefile_name}}
+    steps:
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@main
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{env.ZIP_NAME}}
+          path: .
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{env.SINGLEFILE_NAME}}
+          path: .
+
+      - name: Upload Release Asset
+        env:
+          GH_REPO: ${{ github.repository }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.ZIP_NAME}}
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.SINGLEFILE_NAME}}
+
+      ########################
\ No newline at end of file
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index 5c86a7edd..6850235e9 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -31,6 +31,10 @@ jobs:
       XPRESS: ${{ github.workspace }}/xpress/bin
       XPRS_LIB_Path: ${{ github.workspace }}/xpress/lib
 
+    outputs:
+      TGZ_NAME: ${{ steps.export_output.outputs.TGZ_NAME }}
+      SINGLE_FILE_NAME: ${{ steps.export_output.outputs.SINGLE_FILE_NAME }}
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -119,15 +123,20 @@ jobs:
         run: |
           pushd vcpkg
           git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
+          ./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: Configure
         shell: bash
-        #XPRESS_VALUE = ${{ matrix.xprs }} == "XPRESS-ON" ? "ON" : "OFF"
         run: |
-          [[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
           cmake -B _build -S . \
                 -DCMAKE_C_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \
@@ -138,7 +147,6 @@ jobs:
                 -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_INSTALL_PREFIX=_install \
                 -DBUILD_UI=ON  \
-                -DXPRESS=${{ env.XPRESS_VALUE }} \
                 -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 
       - name: Build
@@ -147,6 +155,118 @@ jobs:
 
       - name: Test
         run: |
-          export PATH=${GITHUB_WORKSPACE}/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
+          export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
           cd _build
           ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer"
+
+      - 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') }}
+
+      #######################
+      - name: Install
+        run: |
+          cd _build
+          cmake --install .
+
+      - id: create-single-file
+        name: Single file .tar.gz creation
+        uses: ./.github/workflows/single-file-creation-tgz
+        with:
+          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+
+      - name: Installer .tar.gz creation
+        run: |
+          cd _build
+          export FILE_NAME="antaresXpansion-${{steps.antares-xpansion-version.outputs.result}}-${{ matrix.os }}"
+          cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=$FILE_NAME
+          #Need to differentiate between xpress/no_xpress files
+          #Cpack command line doesn't seem to care about -P or -R options
+          echo "TGZ_NAME=$FILE_NAME.tar.gz" >> $GITHUB_ENV
+
+      - name: Upload .tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.TGZ_NAME}}
+          path: _build/${{env.TGZ_NAME}}
+
+      - name: Upload single file
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.create-single-file.outputs.archive-name }}
+          path: ${{ steps.create-single-file.outputs.archive-path }}
+
+      - name: export asset name in output
+        id: export_output
+        run: |
+          echo "TGZ_NAME=${{env.TGZ_NAME}}" >> $GITHUB_OUTPUT
+          echo "SINGLE_FILE_NAME=${{ steps.create-single-file.outputs.archive-name }}" >> $GITHUB_OUTPUT
+
+      #######################
+  userguide:
+    if: github.event_name == 'release' && github.event.action == 'created'
+    runs-on: ubuntu-latest
+    outputs:
+      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Read antares-xpansion version
+        id: antares-xpansion-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_xpansion_version'
+
+      - id: create-user-guide
+        name: user guide pdf creation
+        uses: ./.github/workflows/generate-userguide-pdf
+        with:
+          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+
+      - name: user guide upload
+        id: userguide_upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: user-guide
+          path: ${{ steps.create-user-guide.outputs.pdf-path }}
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [ build, userguide ]
+    if: github.event_name == 'release' && github.event.action == 'created'
+    steps:
+      - name: Download userguide
+        uses: actions/download-artifact@v4
+        with:
+          name: user-guide
+          path: docs/
+
+      - name: Download build assets
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{needs.build.outputs.TGZ_NAME}}
+          path: _build/
+
+      - name: Download build assets single file
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{needs.build.outputs.SINGLE_FILE_NAME}}
+          path: .
+
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@main
+
+      - name: Upload Release Asset
+        env:
+          GH_REPO: ${{ github.repository }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} _build/${{needs.build.outputs.TGZ_NAME}}
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{needs.build.outputs.SINGLE_FILE_NAME}}
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index a41422727..cef9fb7c5 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -15,7 +15,7 @@ env:
   GITHUB_TOKEN: ${{ github.token }}
 
 jobs:
-  windows:
+  build:
     runs-on: ${{ matrix.os }}
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     strategy:
@@ -33,6 +33,10 @@ jobs:
       # Indicates the location of the vcpkg as a Git submodule of the project repository.
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
 
+    outputs:
+      zip_name: ${{ steps.zip_name.outputs.zip_name }}
+      singlefile_name: ${{steps.zip_name.outputs.singlefile_name}}
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,12 +51,6 @@ jobs:
           ref: ${{matrix.xprs.ref}}
           token: ${{ secrets.AS_TOKEN }}
 
-      - name: Get release
-        if: github.event_name == 'release' && github.event.action == 'created'
-        id: get_release
-        uses:
-          bruceadams/get-release@v1.3.2
-
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -60,23 +58,6 @@ jobs:
           cache: 'pip'
           cache-dependency-path: requirements*.txt
 
-      # 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 termporary 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.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -103,16 +84,22 @@ jobs:
           path: 'antares-version.json'
           key: 'antares_deps_version'
 
-      - name: Install deps with VCPKG
+      - name: vcpkg install
+        shell: bash
         run: |
-          cd vcpkg
+          mkdir -p ${{ github.workspace }}/vcpkg_cache
+          pushd vcpkg
           git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          vcpkg install --triplet ${{matrix.triplet}}
-          rm -rf buildtrees
-          rm -rf packages
-          rm -rf downloads
-        shell: bash
+          ./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-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: Compile tbb
         uses: ./.github/workflows/compile-tbb
@@ -126,20 +113,21 @@ jobs:
           antares-version: ${{steps.antares-version.outputs.result}}
           os: ${{matrix.os}}
 
-      - name: Expand xpress value in env
-        #I can't seem to expand the variable in the cmake command line so export it in env
-        shell: bash
-        run: |
-          [[ ${{ matrix.xprs.value }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
-          echo "XPRESS_VALUE=$XPRESS_VALUE" >> $GITHUB_ENV
-
       - name: Configure
         run: |
           $pwd=Get-Location
-          cmake -B _build -S .  -DDEPS_INSTALL_DIR=rte-antares-deps-Release -DCMAKE_PREFIX_PATH="$pwd\rte-antares-${{steps.antares-version.outputs.result}}-installer-64bits"  -DBUILD_TESTING=ON  -DCMAKE_BUILD_TYPE=Release  -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake"  -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}  -DCMAKE_INSTALL_PREFIX=_install  -DBUILD_UI=ON  -DXPRESS=${{ env.XPRESS_VALUE }}
+          cmake -B _build -S .  -DDEPS_INSTALL_DIR=rte-antares-deps-Release -DCMAKE_PREFIX_PATH="$pwd\rte-antares-${{steps.antares-version.outputs.result}}-installer-64bits"  -DBUILD_TESTING=ON  -DCMAKE_BUILD_TYPE=Release  -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake"  -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}  -DCMAKE_INSTALL_PREFIX=_install  -DBUILD_UI=ON
       - name: Build
         run: |
           cmake --build _build --config Release -j4
+          
+      - 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') }}
 
       - name: Running unit tests
         timeout-minutes: 120
@@ -149,4 +137,104 @@ jobs:
           set PATH=%PATH%;${{ env.XPRESS }}
           set XPRESSDIR=${{ env.XPRESSDIR }}
           cd _build
-          ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer"
\ No newline at end of file
+          ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer"
+
+      ##############
+      - name: install
+        run: |
+          cd _build
+          cmake --install .
+
+      - name: Create installer .zip
+        shell: bash
+        run: |
+          cd _build
+          cpack -G ZIP
+          export ZIP_NAME=$(ls *.zip)
+          echo "ZIP_NAME=$ZIP_NAME" >> $GITHUB_ENV
+
+      - name: Upload installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.ZIP_NAME}}
+          path: _build/${{env.ZIP_NAME}}
+
+      - name: Create single file .zip
+        id: create-single-file
+        uses: ./.github/workflows/single-file-creation-zip
+        with:
+          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+
+      - name: Upload single file
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.create-single-file.outputs.archive-name }}
+          path: ${{ steps.create-single-file.outputs.archive-path }}
+
+      - id: zip_name
+        shell: bash
+        run: |
+          echo "zip_name=${{env.ZIP_NAME}}" >> "$GITHUB_OUTPUT"
+          echo "singlefile_name=${{steps.create-single-file.outputs.archive-name}}" >> "$GITHUB_OUTPUT"
+  userguide:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' && github.event.action == 'created'
+    outputs:
+      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Read antares-xpansion version
+        id: antares-xpansion-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_xpansion_version'
+
+      - id: create-user-guide
+        name: user guide pdf creation
+        uses: ./.github/workflows/generate-userguide-pdf
+        with:
+          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+
+      - name: user guide upload
+        id: userguide_upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: user-guide
+          path: ${{ steps.create-user-guide.outputs.pdf-path }}
+
+  upload_asset_to_release:
+    if: github.event_name == 'release' && github.event.action == 'created'
+    runs-on: ubuntu-latest
+    needs: [build, userguide]
+    env:
+      ZIP_NAME: ${{needs.build.outputs.zip_name}}
+      SINGLEFILE_NAME: ${{needs.build.outputs.singlefile_name}}
+    steps:
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@main
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{env.ZIP_NAME}}
+          path: .
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{env.SINGLEFILE_NAME}}
+          path: .
+
+      - name: Upload Release Asset
+        env:
+          GH_REPO: ${{ github.repository }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.ZIP_NAME}}
+          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.SINGLEFILE_NAME}}
+
+      ########################
\ No newline at end of file
diff --git a/.github/workflows/centos-release.yml b/.github/workflows/centos-release.yml
deleted file mode 100644
index 99c0a8804..000000000
--- a/.github/workflows/centos-release.yml
+++ /dev/null
@@ -1,321 +0,0 @@
-name: Centos7 release
-
-on:
-  push:
-    branches:
-      - main
-      - develop
-      - ci/*
-      - dependabot/*
-  workflow_dispatch:
-  workflow_run:
-    workflows: [ "Publish Release" ]
-    types:
-      - completed
-  release:
-    types: [ created ]
-
-env:
-  GITHUB_TOKEN: ${{ github.token }}
-
-jobs:
-
-  docker_publish:
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@master
-        with:
-          fetch-depth: 0
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v44
-        with:
-          files: |
-            docker/centos7-system-deps
-
-      - name: Docker file push
-        id: docker_push
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: elgohr/Publish-Docker-Github-Action@main
-        with:
-          name: antaresrte/xpansion-centos7
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          workdir: docker
-          dockerfile: centos7-system-deps
-          cache: false
-          tags: latest,1.0.0
-
-  userguide:
-    runs-on: ubuntu-latest
-    outputs:
-      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - id: create-user-guide
-        name: user guide pdf creation
-        uses: ./.github/workflows/generate-userguide-pdf
-        with:
-          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
-
-      - name: user guide upload
-        id: userguide_upload
-        uses: actions/upload-artifact@v3 #aligned with download in centOS job
-        with:
-          name: user-guide
-          path: ${{ steps.create-user-guide.outputs.pdf-path }}
-
-  versions:
-    runs-on: ubuntu-latest
-    outputs:
-      antares-version: ${{steps.antares-version.outputs.result}}
-      antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
-      antares-deps-version: ${{steps.antares-deps-version.outputs.result}}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Read antares-solver version
-        id: antares-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_version'
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - name: Read antares-deps version
-        id: antares-deps-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_deps_version'
-
-  build:
-    runs-on: ubuntu-latest
-    needs: [ docker_publish, userguide, versions ]
-    container: 'antaresrte/xpansion-centos7'
-    strategy:
-      matrix:
-        xprs: [
-          XPRESS-ON,
-          #XPRESS-OFF
-        ]
-    env:
-      XPRESSDIR: ${{ github.workspace }}/xpress
-      XPRESS: ${{ github.workspace }}/xpress/bin
-      XPRS_LIB_Path: ${{ github.workspace }}/xpress/lib
-      XPRESSDIR_CONTAINER: ${GITHUB_WORKSPACE}/xpress
-      XPRESS_CONTAINER: ${GITHUB_WORKSPACE}/xpress/bin
-      XPRS_LIB_Path_CONTAINER: ${GITHUB_WORKSPACE}/xpress/lib
-    outputs:
-      zip_name: ${{ steps.zip_name.outputs.zip_name }}
-      singlefile_name: ${{ steps.zip_name.outputs.singlefile_name }}
-    steps:
-      - id: branch-name
-        uses: tj-actions/branch-names@v8
-
-      - name: Checkout
-        uses: actions/checkout@v3 #keep v3
-        with:
-          submodules: true
-
-      - run: |
-          source /opt/rh/devtoolset-10/enable
-          echo $PATH >> $GITHUB_PATH
-
-      - run: |
-          yum install -y nodejs
-
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.13
-        with:
-          cmake-version: '3.28.x'
-
-      - name: Download pre-compiled librairies
-        uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
-        with:
-          antares-deps-version: ${{needs.versions.outputs.antares-deps-version}}
-          antares-version: ${{needs.versions.outputs.antares-version}}
-          os: centos7
-          os-full-name: CentOS-7.9.2009
-
-      - name: Compile tbb
-        uses: ./.github/workflows/compile-tbb
-
-      - name: Install dependencies
-        run: |
-          pip3 install --upgrade pip
-          pip3 install wheel #Does not work in requirements
-          pip3 install -r requirements-tests.txt
-          pip3 install -r requirements-ui.txt
-
-      - name: Download userguide
-        uses: actions/download-artifact@v3
-        with:
-          name: user-guide
-          path: docs/
-
-      - name: Checkout xpressmp linux
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.AS_TOKEN }}
-          repository: rte-france/xpress-mp
-          path: ${{ env.XPRESSDIR }}
-          github-server-url: https://github.com
-          ref: 8.13a
-        if: matrix.xprs == 'XPRESS-ON'
-
-      - name: Restore vcpkg and its artifacts.
-        uses: actions/cache@v3
-        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 termporary 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.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}
-
-
-      - name: vcpkg install
-        run: |
-          pushd vcpkg
-          git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
-
-      - name: Configure
-        shell: bash
-        run: |
-          if [ ${{ matrix.xprs }} == "XPRESS-ON" ]; then
-          export XPRESS_VALUE="ON"
-          else
-          export XPRESS_VALUE="OFF"
-          fi
-          source /opt/rh/devtoolset-10/enable
-          cmake -B _build -S . \
-                 -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
-                 -DBUILD_TESTING=ON \
-                 -DCMAKE_BUILD_TYPE=Release \
-                 -DCMAKE_INSTALL_PREFIX=_install \
-                 -DBUILD_UI=ON \
-                 -DUSER_GUIDE_PATH="docs/${{ needs.userguide.outputs.pdf-name }}" \
-                 -DXPRESS=${XPRESS_VALUE} \
-                 -DALLOW_RUN_AS_ROOT=ON \
-                 -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
-
-      - name: Build
-        shell: bash
-        run: |
-          cmake --build _build --config Release -j$(nproc)
-          cd _build
-          cmake --install .
-
-      - name: Running unit tests
-        timeout-minutes: 120
-        shell: bash
-        run: |
-          export PATH=${GITHUB_WORKSPACE}/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
-          export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }}
-          export XPRESS=${{ env.XPRESS_CONTAINER }}
-          cd _build
-          ctest -C Release --output-on-failure -L "unit|benders|lpnamer|medium"
-
-      - name: set name variables
-        id: single_file_name
-        shell: bash
-        run: |
-          if [ ${{ matrix.xprs }} == "XPRESS-ON" ]; then
-          WITH_XPRS="-xpress"
-          else
-          WITH_XPRS=""
-          fi
-          VERSION=${{needs.versions.outputs.antares-xpansion-version}}${WITH_XPRS}
-          echo "VERSION_WITH_XPRESS=$VERSION" >> $GITHUB_ENV
-
-      - name: .tar.gz creation
-        run: |
-          cd _build
-          export FILE_NAME="antaresXpansion-${{env.VERSION_WITH_XPRESS}}-CentOS-7.9.2009"
-          cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=$FILE_NAME
-          echo "TGZ_NAME=$FILE_NAME.tar.gz" >> $GITHUB_ENV
-
-      - name: Upload .tar.gz
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{env.TGZ_NAME}}
-          path: _build/${{env.TGZ_NAME}}
-
-      - id: create-single-file
-        name: Single file .tar.gz creation
-        uses: ./.github/workflows/single-file-creation-tgz
-        with:
-          antares-xpansion-version: ${{env.VERSION_WITH_XPRESS}}
-
-      - name: Upload single file
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ steps.create-single-file.outputs.archive-name }}
-          path: ${{ steps.create-single-file.outputs.archive-path }}
-
-      - id: zip_name
-        run: |
-          echo "singlefile_name=${{steps.create-single-file.outputs.archive-name}}" >> "$GITHUB_OUTPUT"
-          echo "zip_name=${{env.TGZ_NAME}}" >> "$GITHUB_OUTPUT"
-      #######################
-
-  upload_asset_to_release:
-    if: github.event_name == 'release' && github.event.action == 'created'
-    runs-on: ubuntu-latest
-    needs: build
-    env:
-      ZIP_NAME: ${{needs.build.outputs.zip_name}}
-      SINGLEFILE_NAME: ${{needs.build.outputs.singlefile_name}}
-    steps:
-      - name: Get release
-        if: github.event_name == 'release' && github.event.action == 'created'
-        id: get_release
-        uses: bruceadams/get-release@main
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.ZIP_NAME}}
-          path: .
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{env.SINGLEFILE_NAME}}
-          path: .
-
-      - name: Upload Release Asset
-        env:
-          GH_REPO: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.ZIP_NAME}}
-          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.SINGLEFILE_NAME}}
-
-      ########################
diff --git a/.github/workflows/ol8-release.yml b/.github/workflows/ol8-release.yml
deleted file mode 100644
index e74ec6537..000000000
--- a/.github/workflows/ol8-release.yml
+++ /dev/null
@@ -1,284 +0,0 @@
-name: Oracle-linux8 release
-
-on:
-  push:
-    branches:
-      - main
-      - develop
-      - ci/*
-      - dependabot/*
-  workflow_dispatch:
-  workflow_run:
-    workflows: [ "Publish Release" ]
-    types:
-      - completed
-  release:
-    types: [ created ]
-
-env:
-  GITHUB_TOKEN: ${{ github.token }}
-
-jobs:
-  userguide:
-    runs-on: ubuntu-latest
-    outputs:
-      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - id: create-user-guide
-        name: user guide pdf creation
-        uses: ./.github/workflows/generate-userguide-pdf
-        with:
-          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
-
-      - name: user guide upload
-        id: userguide_upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: user-guide
-          path: ${{ steps.create-user-guide.outputs.pdf-path }}
-
-  versions:
-    runs-on: ubuntu-latest
-    outputs:
-      antares-version: ${{steps.antares-version.outputs.result}}
-      antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
-      antares-deps-version: ${{steps.antares-deps-version.outputs.result}}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Read antares-solver version
-        id: antares-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_version'
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - name: Read antares-deps version
-        id: antares-deps-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_deps_version'
-
-  build:
-    runs-on: ubuntu-latest
-    needs: [ userguide, versions ]
-    container: 'oraclelinux:8'
-    strategy:
-      matrix:
-        xprs: [
-          { value: XPRESS-ON, ref: 9.2.5 },
-          #{ value: XPRESS-OFF }
-        ]
-    env:
-      XPRESSDIR: ${{ github.workspace }}/xpress
-      XPRESS: ${{ github.workspace }}/xpress/bin
-      XPRS_LIB_Path: ${{ github.workspace }}/xpress/lib
-      XPRESSDIR_CONTAINER: ${GITHUB_WORKSPACE}/xpress
-      XPRESS_CONTAINER: ${GITHUB_WORKSPACE}/xpress/bin
-      XPRS_LIB_Path_CONTAINER: ${GITHUB_WORKSPACE}/xpress/lib
-    outputs:
-      zip_name: ${{ steps.zip_name.outputs.zip_name }}
-      singlefile_name: ${{ steps.zip_name.outputs.singlefile_name }}
-    steps:
-      - id: branch-name
-        uses: tj-actions/branch-names@v8
-
-      - name: Install System
-        run: |
-          dnf install -y epel-release git wget rpm-build redhat-lsb-core
-          dnf install -y unzip libuuid-devel gcc-toolset-10-toolchain zlib-devel python3-devel
-          source /opt/rh/gcc-toolset-10/enable
-          echo $PATH >> $GITHUB_PATH
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - run: |
-          dnf module install -y nodejs:20/common
-
-      - uses: lukka/get-cmake@latest
-        with:
-          useLocalCache: false
-          useCloudCache: true
-
-      - run: |
-          mkdir -p ${{ github.workspace }}/vcpkg_cache
-
-      - name: vcpkg install
-        run: |
-          pushd vcpkg
-          git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
-
-      - name: Download pre-compiled librairies
-        uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
-        with:
-          antares-deps-version: ${{needs.versions.outputs.antares-deps-version}}
-          antares-version: ${{needs.versions.outputs.antares-version}}
-          os: oracle8
-          os-full-name: OracleServer-8.9
-          #variant: -ortools-xpress
-
-      - name: Compile tbb
-        uses: ./.github/workflows/compile-tbb
-
-      - name: Install dependencies
-        run: |
-          pip3 install --upgrade pip
-          pip3 install wheel #Does not work in requirements
-          pip3 install -r requirements-tests.txt
-          pip3 install -r requirements-ui.txt
-
-      - name: Download userguide
-        uses: actions/download-artifact@v4
-        with:
-          name: user-guide
-          path: docs/
-
-      - name: Checkout xpressmp linux
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.AS_TOKEN }}
-          repository: rte-france/xpress-mp
-          path: ${{ env.XPRESSDIR }}
-          github-server-url: https://github.com
-          ref: ${{matrix.xprs.ref}}
-        if: matrix.xprs.value == 'XPRESS-ON'
-
-      - name: Configure
-        shell: bash
-        run: |
-          if [ ${{ matrix.xprs.value }} == "XPRESS-ON" ]; then
-          export XPRESS_VALUE="ON"
-          else
-          export XPRESS_VALUE="OFF"
-          fi
-          source /opt/rh/gcc-toolset-10/enable
-          export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
-          export PATH=/usr/lib64/openmpi/bin:$PATH
-          cmake -B _build -S . \
-                 -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
-                 -DBUILD_TESTING=ON \
-                 -DCMAKE_BUILD_TYPE=Release \
-                 -DCMAKE_INSTALL_PREFIX=_install \
-                 -DBUILD_UI=ON \
-                 -DUSER_GUIDE_PATH="docs/${{ needs.userguide.outputs.pdf-name }}" \
-                 -DXPRESS=${XPRESS_VALUE} \
-                 -DALLOW_RUN_AS_ROOT=ON \
-                 -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
-
-      - name: Build
-        shell: bash
-        run: |
-          cmake --build _build --config Release -j$(nproc)
-          cd _build
-          cmake --install .
-
-      - name: Running unit tests
-        timeout-minutes: 120
-        shell: bash
-        run: |
-          export PATH=${GITHUB_WORKSPACE}/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
-          export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }}
-          export XPRESS=${{ env.XPRESS_CONTAINER }}
-          cd _build
-          ctest -C Release --output-on-failure -L "unit|benders|lpnamer|medium"
-
-      - name: set name variables
-        id: single_file_name
-        shell: bash
-        run: |
-          if [ ${{ matrix.xprs.value }} == "XPRESS-ON" ]; then
-          WITH_XPRS="-xpress"
-          else
-          WITH_XPRS=""
-          fi
-          VERSION=${{needs.versions.outputs.antares-xpansion-version}}${WITH_XPRS}
-          echo "VERSION_WITH_XPRESS=$VERSION" >> $GITHUB_ENV
-
-      - name: .tar.gz creation
-        run: |
-          cd _build
-          export FILE_NAME="antaresXpansion-${{env.VERSION_WITH_XPRESS}}-OracleServer-8.9"
-          cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=$FILE_NAME
-          echo "TGZ_NAME=$FILE_NAME.tar.gz" >> $GITHUB_ENV
-
-      - name: Upload .tar.gz
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{env.TGZ_NAME}}
-          path: _build/${{env.TGZ_NAME}}
-
-      - id: create-single-file
-        name: Single file .tar.gz creation
-        uses: ./.github/workflows/single-file-creation-tgz
-        with:
-          antares-xpansion-version: ${{env.VERSION_WITH_XPRESS}}
-
-      - name: Upload single file
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.create-single-file.outputs.archive-name }}
-          path: ${{ steps.create-single-file.outputs.archive-path }}
-
-      - id: zip_name
-        run: |
-          echo "singlefile_name=${{steps.create-single-file.outputs.archive-name}}" >> "$GITHUB_OUTPUT"
-          echo "zip_name=${{env.TGZ_NAME}}" >> "$GITHUB_OUTPUT"
-      #######################
-
-  upload_asset_to_release:
-    if: github.event_name == 'release' && github.event.action == 'created'
-    runs-on: ubuntu-latest
-    needs: build
-    env:
-      ZIP_NAME: ${{needs.build.outputs.zip_name}}
-      SINGLEFILE_NAME: ${{needs.build.outputs.singlefile_name}}
-    steps:
-      - name: Get release
-        if: github.event_name == 'release' && github.event.action == 'created'
-        id: get_release
-        uses: bruceadams/get-release@main
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{env.ZIP_NAME}}
-          path: .
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{env.SINGLEFILE_NAME}}
-          path: .
-
-      - name: Upload Release Asset
-        env:
-          GH_REPO: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.ZIP_NAME}}
-          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.SINGLEFILE_NAME}}
-
-      ########################
\ No newline at end of file
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 59eba6eae..015a45381 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -102,6 +102,23 @@ jobs:
       - name: Init submodule
         run: |
           git submodule update --init --recursive .
+          
+      - run: |
+          mkdir -p ${{ github.workspace }}/vcpkg_cache
+
+      - name: vcpkg install
+        run: |
+          pushd 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: Configure
         shell: bash
@@ -120,6 +137,14 @@ jobs:
           -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
           -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 
+      - 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') }}
+
       - run: |
           sed -i 's#: ".*/mpicxx #: "g++ #' $GITHUB_WORKSPACE/_build/compile_commands.json
 
diff --git a/.github/workflows/ubuntu-release.yml b/.github/workflows/ubuntu-release.yml
deleted file mode 100644
index 7390e31cf..000000000
--- a/.github/workflows/ubuntu-release.yml
+++ /dev/null
@@ -1,251 +0,0 @@
-name: Ubuntu Release
-
-on:
-  push:
-    branches:
-      - main
-      - develop
-      - ci/*
-      - dependabot/*
-  workflow_dispatch:
-  workflow_run:
-    workflows: [ "Publish Release" ]
-    types:
-      - completed
-  release:
-    types: [ created ]
-
-env:
-  GITHUB_TOKEN: ${{ github.token }}
-
-jobs:
-
-  userguide:
-    runs-on: ubuntu-latest
-    outputs:
-      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - id: create-user-guide
-        name: user guide pdf creation
-        uses: ./.github/workflows/generate-userguide-pdf
-        with:
-          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
-
-      - name: user guide upload
-        id: userguide_upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: user-guide
-          path: ${{ steps.create-user-guide.outputs.pdf-path }}
-
-  build:
-
-    needs: userguide
-    runs-on: ${{ matrix.os }}
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    strategy:
-      matrix:
-        os: [ ubuntu-20.04 ]
-        xprs: [
-          XPRESS-ON,
-          #XPRESS-OFF
-        ]
-    env:
-      XPRESSDIR: ${{ github.workspace }}/xpress
-      XPRESS: ${{ github.workspace }}/xpress/bin
-      XPRS_LIB_Path: ${{ github.workspace }}/xpress/lib
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Checkout xpressmp linux
-        if: matrix.xprs == 'XPRESS-ON'
-        uses: actions/checkout@v4
-        with:
-          repository: rte-france/xpress-mp
-          path: ${{ env.XPRESSDIR }}
-          ref: 8.13a
-          token: ${{ secrets.AS_TOKEN }} #reniew token periodically
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.3
-        with:
-          key: ${{ matrix.os }}-${{ matrix.xprs }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.8
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements-tests.txt
-          pip install -r requirements-ui.txt
-
-      - name: Install mandatory system libraries
-        run: |
-          sudo apt-get update --fix-missing
-          sudo apt-get install libtbb-dev
-
-      - uses: lukka/get-cmake@latest
-        with:
-          useLocalCache: false
-          useCloudCache: true
-
-      - name: Update alternatives
-        #mpicxx  uses "g++" so we need g++ to be symbolic link to g++-10
-        run: |
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
-          sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30
-          sudo update-alternatives --set cc /usr/bin/gcc
-          sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30
-          sudo update-alternatives --set c++ /usr/bin/g++
-
-      - name: Read antares-solver version
-        id: antares-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_version'
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - name: Read antares-deps version
-        id: antares-deps-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: '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.result}}
-          antares-version: ${{steps.antares-version.outputs.result}}
-          os: ${{matrix.os}}
-          os-full-name: Ubuntu-20.04
-
-      - name: Download userguide
-        uses: actions/download-artifact@v4
-        with:
-          name: user-guide
-          path: docs/
-
-      - run: |
-          mkdir -p ${{ github.workspace }}/vcpkg_cache
-
-      - name: vcpkg install
-        run: |
-          pushd vcpkg
-          git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
-
-      - name: Configure
-        shell: bash
-        run: |
-          if [ ${{ matrix.xprs }} == "XPRESS-ON" ]; then
-            XPRESS_VALUE="ON"
-          else
-            XPRESS_VALUE="OFF"
-          fi
-          cmake -B _build -S . \
-                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
-                -DBUILD_TESTING=ON \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_INSTALL_PREFIX=_install \
-                -DBUILD_UI=ON  \
-                -DUSER_GUIDE_PATH="docs/${{ needs.userguide.outputs.pdf-name }}" \
-                -DXPRESS=${{ env.XPRESS_VALUE }} \
-                -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
-
-      - name: Build
-        run: |
-          cmake --build _build --config Release -j$(nproc)
-          cd _build
-          cmake --install .
-
-      - name: set name variables
-        id: single_file_name
-        shell: bash
-        run: |
-          if [ ${{ matrix.xprs }} == "XPRESS-ON" ]; then
-            WITH_XPRS="-xpress"
-          else
-            WITH_XPRS=""
-          fi
-          VERSION=${{steps.antares-xpansion-version.outputs.result}}${WITH_XPRS}
-          echo "VERSION_WITH_XPRESS=$VERSION" >> $GITHUB_ENV
-
-      - id: create-single-file
-        name: Single file .tar.gz creation
-        uses: ./.github/workflows/single-file-creation-tgz
-        with:
-          antares-xpansion-version: ${{env.VERSION_WITH_XPRESS}}
-
-      - name: Installer .tar.gz creation
-        run: |
-          cd _build
-          export FILE_NAME="antaresXpansion-${{env.VERSION_WITH_XPRESS}}-${{ matrix.os }}"
-          cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=$FILE_NAME
-          #Need to differentiate between xpress/no_xpress files
-          #Cpack command line doesn't seem to care about -P or -R options
-          echo "TGZ_NAME=$FILE_NAME.tar.gz" >> $GITHUB_ENV
-
-      - name: Running unit tests
-        run: |
-          export PATH=${GITHUB_WORKSPACE}/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
-          cd _build
-          ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer"
-
-      #Uploads are not necessary for release but useful in other cases
-      - name: Upload .tar.gz
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{env.TGZ_NAME}}
-          path: _build/${{env.TGZ_NAME}}
-
-      - name: Upload single file
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.create-single-file.outputs.archive-name }}
-          path: ${{ steps.create-single-file.outputs.archive-path }}
-
-      #######################
-
-      - name: Get release
-        if: github.event_name == 'release' && github.event.action == 'created'
-        id: get_release
-        uses: bruceadams/get-release@main
-
-      - name: Upload Release Asset
-        if: github.event_name == 'release' && github.event.action == 'created'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload ${{ steps.get_release.outputs.tag_name }} _build/${{env.TGZ_NAME}}
-          gh release upload ${{ steps.get_release.outputs.tag_name }} ${{ steps.create-single-file.outputs.archive-path }}
-
-      ########################
\ No newline at end of file
diff --git a/.github/workflows/ubuntu-system-deps-build.yml b/.github/workflows/ubuntu-system-deps-build.yml
index a64e36103..5f5412f7e 100644
--- a/.github/workflows/ubuntu-system-deps-build.yml
+++ b/.github/workflows/ubuntu-system-deps-build.yml
@@ -66,13 +66,23 @@ jobs:
       - run: |
           mkdir -p ${{ github.workspace }}/vcpkg_cache
 
+      - run: |
+          mkdir -p ${{ github.workspace }}/vcpkg_cache
+
       - name: vcpkg install
         run: |
           pushd vcpkg
           git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
+          ./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: Configure
         run: |
@@ -84,6 +94,14 @@ jobs:
                 -DBUILD_UI=ON \
                 -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 
+      - 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') }}
+
       - name: Build
         run: |
           cmake --build _build --config Release -j$(nproc)
@@ -92,7 +110,7 @@ jobs:
 
       - name: Running unit tests
         run: |
-          export PATH=${GITHUB_WORKSPACE}/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
+          export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH
           cd _build
           ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer"
 
diff --git a/.github/workflows/windows-vcpkg-deps-build.yml b/.github/workflows/windows-vcpkg-deps-build.yml
index 145dbc3d4..5ee8f41a0 100644
--- a/.github/workflows/windows-vcpkg-deps-build.yml
+++ b/.github/workflows/windows-vcpkg-deps-build.yml
@@ -34,23 +34,6 @@ jobs:
         with:
           python-version: '3.x'
 
-      # 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 termporary 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.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -71,16 +54,22 @@ jobs:
           path: 'antares-version.json'
           key: 'antares_xpansion_version'
 
-      - name: Install deps with VCPKG
+      - name: vcpkg install
+        shell: bash
         run: |
-          cd vcpkg
+          mkdir -p ${{ github.workspace }}/vcpkg_cache
+          pushd vcpkg
           git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          vcpkg install --triplet ${{matrix.triplet}}
-          rm -rf buildtrees
-          rm -rf packages
-          rm -rf downloads
-        shell: bash
+          ./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-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: Compile tbb
         uses: ./.github/workflows/compile-tbb
@@ -92,6 +81,14 @@ jobs:
           $pwd=Get-Location
           cmake -B _build -S . -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DCMAKE_INSTALL_PREFIX=_install -DBUILD_UI=ON
 
+      - 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') }}
+
       - name: Build
         run: |
           cmake --build _build --config Release -j4
diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
deleted file mode 100644
index 9cb96f8b2..000000000
--- a/.github/workflows/windows-vcpkg.yml
+++ /dev/null
@@ -1,284 +0,0 @@
-name: Windows release
-
-on:
-  push:
-    branches:
-      - main
-      - develop
-      - ci/*
-      - dependabot/*
-  workflow_dispatch:
-  workflow_run:
-    workflows: [ "Publish Release" ]
-    types:
-      - completed
-  release:
-    types: [ created ]
-
-env:
-  GITHUB_TOKEN: ${{ github.token }}
-
-jobs:
-
-  userguide:
-    runs-on: ubuntu-latest
-    outputs:
-      pdf-name: ${{ steps.create-user-guide.outputs.pdf-name }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - id: create-user-guide
-        name: user guide pdf creation
-        uses: ./.github/workflows/generate-userguide-pdf
-        with:
-          antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
-
-      - name: user guide upload
-        id: userguide_upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: user-guide
-          path: ${{ steps.create-user-guide.outputs.pdf-path }}
-
-  build:
-    needs: userguide
-    runs-on: ${{ matrix.os }}
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    strategy:
-      matrix:
-        os: [ windows-latest ]
-        triplet: [ x64-windows ]
-        xprs: [
-          XPRESS-ON,
-          #XPRESS-OFF
-        ]
-    env:
-      XPRESSDIR: ${{ github.workspace }}\xpress
-      XPRESS: ${{ github.workspace }}\xpress\bin
-      XPRS_LIB_Path: ${{ github.workspace }}\xpress\lib
-      # Indicates the location of the vcpkg as a Git submodule of the project repository.
-      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
-    outputs:
-      zip_name: ${{ steps.zip_name.outputs.zip_name }}
-      singlefile_name: ${{steps.zip_name.outputs.singlefile_name}}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Enable git longpaths
-        run: git config --system core.longpaths true
-
-      - name: Checkout xpressmp linux
-        if: matrix.xprs == 'XPRESS-ON'
-        uses: actions/checkout@v4
-        with:
-          repository: rte-france/xpress-mp-temp
-          path: ${{ env.XPRESSDIR }}
-          ref: 8.13a
-          token: ${{ secrets.AS_TOKEN }}
-
-      - name: Get release
-        if: github.event_name == 'release' && github.event.action == 'created'
-        id: get_release
-        uses:
-          bruceadams/get-release@main
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      # 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 termporary 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.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements-tests.txt
-          pip install -r requirements-ui.txt
-
-      - name: Pre-requisites
-        shell: cmd
-        run: |
-          choco install wget zip unzip --no-progress
-          wget -nv https://github.com/microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisetup.exe
-          msmpisetup.exe -unattend
-
-      - name: Read antares-solver version
-        id: antares-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_version'
-
-      - name: Read antares-xpansion version
-        id: antares-xpansion-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_xpansion_version'
-
-      - name: Read antares-deps version
-        id: antares-deps-version
-        uses: ./.github/actions/read-json-value
-        with:
-          path: 'antares-version.json'
-          key: 'antares_deps_version'
-
-      - name: Install deps with VCPKG
-        run: |
-          cd vcpkg
-          git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          vcpkg install --triplet ${{matrix.triplet}}
-          rm -rf buildtrees
-          rm -rf packages
-          rm -rf downloads
-        shell: bash
-
-      - name: Compile tbb
-        uses: ./.github/workflows/compile-tbb
-        with:
-          cmake: 'cmake'
-
-      - name: Download pre-compiled librairies
-        uses: ./.github/workflows/download-extract-precompiled-libraries-zip
-        with:
-          antares-deps-version: ${{steps.antares-deps-version.outputs.result}}
-          antares-version: ${{steps.antares-version.outputs.result}}
-          os: ${{matrix.os}}
-
-      - name: Download userguide
-        uses: actions/download-artifact@v4
-        with:
-          name: user-guide
-          path: docs/
-
-      - name: Expand xpress value in env
-        #I can't seem to expand the variable in the cmake command line so export it in env
-        shell: bash
-        run: |
-          [[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF"
-          echo "XPRESS_VALUE=$XPRESS_VALUE" >> $GITHUB_ENV
-
-      - name: Configure
-        #Inverted ternary : @({'condition is false'},{'condition is true'})[$condition] => ({true}, {false})[!$condition]
-        run: |
-          $pwd=Get-Location
-          cmake -B _build -S . -DDEPS_INSTALL_DIR=rte-antares-deps-Release -DCMAKE_PREFIX_PATH="$pwd\rte-antares-${{steps.antares-version.outputs.result}}-installer-64bits" -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release  -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DCMAKE_INSTALL_PREFIX=_install -DBUILD_UI=ON -DUSER_GUIDE_PATH="docs/${{ needs.userguide.outputs.pdf-name }}" -DXPRESS=${{ env.XPRESS_VALUE }}
-
-      - name: Build
-        run: |
-          cmake --build _build --config Release -j4
-          cd _build
-          cmake --install .
-
-      - name: Running unit tests
-        shell: cmd
-        run: |
-          set PATH=%PATH%;C:\Program Files\Microsoft MPI\Bin\
-          set PATH=%PATH%;${{ env.XPRESS }}
-          set XPRESSDIR=${{ env.XPRESSDIR }}
-          cd _build
-          ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer"
-
-      - name: Create installer .zip
-        shell: bash
-        run: |
-          cd _build
-          cpack -G ZIP
-          export ZIP_NAME=$(ls *.zip)
-          echo "ZIP_NAME=$ZIP_NAME" >> $GITHUB_ENV
-
-      - name: set name variables
-        id: single_file_name
-        shell: bash
-        run: |
-          [[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
-          XPRS=${{ env.XPRESS_VALUE }}
-          [ $XPRS == "ON" ] && WITH_XPRS="-xpress" || WITH_XPRS=""
-          VERSION=${{steps.antares-xpansion-version.outputs.result}}${WITH_XPRS}
-          echo "VERSION_WITH_XPRESS=$VERSION"
-          echo "VERSION_WITH_XPRESS=$VERSION" >> $GITHUB_ENV
-
-      - name: Upload installer
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{env.ZIP_NAME}}
-          path: _build/${{env.ZIP_NAME}}
-
-      - name: Create single file .zip
-        id: create-single-file
-        uses: ./.github/workflows/single-file-creation-zip
-        with:
-          antares-xpansion-version: ${{env.VERSION_WITH_XPRESS}}
-
-      - name: Upload single file
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.create-single-file.outputs.archive-name }}
-          path: ${{ steps.create-single-file.outputs.archive-path }}
-
-      - id: zip_name
-        shell: bash
-        run: |
-          echo "zip_name=${{env.ZIP_NAME}}" >> "$GITHUB_OUTPUT"
-          echo "singlefile_name=${{steps.create-single-file.outputs.archive-name}}" >> "$GITHUB_OUTPUT"
-
-  upload_asset_to_release:
-    if: github.event_name == 'release' && github.event.action == 'created'
-    runs-on: ubuntu-latest
-    needs: build
-    env:
-      ZIP_NAME: ${{needs.build.outputs.zip_name}}
-      SINGLEFILE_NAME: ${{needs.build.outputs.singlefile_name}}
-    steps:
-      - name: Get release
-        if: github.event_name == 'release' && github.event.action == 'created'
-        id: get_release
-        uses: bruceadams/get-release@main
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{env.ZIP_NAME}}
-          path: .
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{env.SINGLEFILE_NAME}}
-          path: .
-
-      - name: Upload Release Asset
-        env:
-          GH_REPO: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.ZIP_NAME}}
-          gh release upload --repo ${{env.GH_REPO}} ${{ steps.get_release.outputs.tag_name }} ${{env.SINGLEFILE_NAME}}
-
-      ########################
\ No newline at end of file
diff --git a/vcpkg b/vcpkg
index a34c873a9..6e31ee33c 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit a34c873a9717a888f58dc05268dea15592c2f0ff
+Subproject commit 6e31ee33cc9fc93599c4ceb38e229098cf339bb7
diff --git a/vcpkg.json b/vcpkg.json
index 89eb11e18..338254fa6 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "antares-xpansion",
   "version-string": "1.2.2",
-  "builtin-baseline": "9484a57dd560b89f0a583be08af6753611c57fd5",
+  "builtin-baseline": "943c5ef1c8f6b5e6ced092b242c8299caae2ff01",
   "dependencies": [
     "jsoncpp",
     "gtest",