update vcpkg to 2023.04.21

.github/workflows/build_windows.yml

@@ -71,7 +71,7 @@ jobs:
           # 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' )}}-${{ matrix.triplet }}
+            ${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}
 
       - name: Install dependencies
         run: |
@@ -103,12 +103,17 @@ jobs:
         run: |
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          vcpkg install jsoncpp gtest boost-mpi boost-program-options tbb zlib --triplet ${{matrix.triplet}}
+          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:

.github/workflows/centos7-system-deps-build.yml

@@ -81,7 +81,9 @@ jobs:
           prefix: "../rte-antares-deps-Release/"
 
       - name: Compile tbb
-        uses: ./.github/workflows/compile-tbb
+        uses: ./.github/workflows/compile-tbb   
+        with:
+          cmake: 'cmake3'     
 
       - name: Configure
         run: |

.github/workflows/compile-tbb/action.yml

@@ -1,5 +1,9 @@
 name: "Download and compile tbb"
 description: "tbb is required for execution policy (parallelization c++)."
+inputs:
+  cmake:
+    description: 'cmake version'
+    required: true
 runs:
   using: "composite"
   steps: 
@@ -8,5 +12,5 @@ runs:
     run: |  
       git clone https://github.com/wjakob/tbb.git 
       cd tbb/build 
-      cmake3 .. 
-      cmake3 --build . --target install -j8
+      ${{ inputs.cmake }} .. 
+      ${{ inputs.cmake }} --build . --target install -j8

.github/workflows/windows-vcpkg-deps-build.yml

@@ -50,7 +50,7 @@ jobs:
           # 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' )}}-${{ matrix.triplet }}-invalidate
+            ${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
 
       - name: Install dependencies
         run: |
@@ -76,12 +76,17 @@ jobs:
         run: |
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          vcpkg install jsoncpp gtest boost-mpi boost-program-options tbb zlib --triplet ${{matrix.triplet}}
+          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: Configure
         run: |
           $pwd=Get-Location

.github/workflows/windows-vcpkg.yml

@@ -103,7 +103,7 @@ jobs:
           # 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' )}}-${{ matrix.triplet }}-invalidate
+            ${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
 
       - name: Install dependencies
         run: |
@@ -143,12 +143,17 @@ jobs:
         run: |
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          vcpkg install jsoncpp gtest boost-mpi boost-program-options tbb zlib --triplet ${{matrix.triplet}}
+          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:

docker/centos7-bare

@@ -1,6 +1,6 @@
 FROM centos:7
 
-# Install requirements : update repo
+# Install requirements: update repo
 RUN yum update -y
 
 # Install requirements : install epel
@@ -30,4 +30,4 @@ RUN yum install -y python3-pip &&\
 
 #create user
 RUN useradd user
-# USER user
+# USER user

vcpkg_manifest/vcpkg.json → vcpkg.json

@@ -6,10 +6,6 @@
     "gtest",
     "boost-mpi",
     "boost-program-options",
-    "tbb",
     "zlib"
-  ],
-  "overrides": [
-    { "name": "tbb", "version": "2020_U3" }
   ]
-}
+}