From 03dc8844ad83bb907fa4595bc24ae3096a6a3bfe Mon Sep 17 00:00:00 2001
From: joaquintides <joaquin@tid.es>
Date: Mon, 16 Jan 2023 11:52:42 +0100
Subject: [PATCH] refactored vcpkg triplet management

---
 .github/workflows/benchmarks.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 11254ee9..a5eb0279 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -16,6 +16,7 @@ jobs:
           - name: gcc-x64
             compiler: g++-11
             architecture: -m64
+            vcpkgtriplet: x64-linux 
             sourcefile: main.cpp
             download-datafiles: true
             compileroptions: -std=c++2a -O3 -DNDEBUG -DCFOA_EMBEDDED_GROUP_ACCESS
@@ -28,6 +29,7 @@ jobs:
           - name: clang-x64
             compiler: clang++-12
             architecture: -m64
+            vcpkgtriplet: x64-linux 
             sourcefile: main.cpp
             download-datafiles: true
             compileroptions: -std=c++2a -O3 -DNDEBUG -DCFOA_EMBEDDED_GROUP_ACCESS
@@ -40,6 +42,7 @@ jobs:
           - name: clang-arm64
             compiler: clang++
             architecture: -m64
+            vcpkgtriplet: arm64-osx 
             sourcefile: main.cpp
             download-datafiles: true
             compileroptions: -std=c++2a -O3 -DNDEBUG -DCFOA_EMBEDDED_GROUP_ACCESS -DNUM_THREADS=8
@@ -52,7 +55,7 @@ jobs:
           - name: gcc-x86
             compiler: g++-11
             architecture: -m32
-            vcpktriplet: :x86-linux 
+            vcpkgtriplet: x86-linux 
             sourcefile: main.cpp
             download-datafiles: true
             compileroptions: -std=c++2a -O3 -DNDEBUG -DCFOA_EMBEDDED_GROUP_ACCESS
@@ -95,13 +98,11 @@ jobs:
       - name: Install oneTBB
         run: |
           if [ -n "${{matrix.xcode_version}}" ]; then
-            echo "VCPKG_OUTPUT_PATH=$GITHUB_WORKSPACE/vcpkg/installed/arm64-osx" >> $GITHUB_ENV
             export PATH=/opt/homebrew/bin:$PATH
             cd ~
             mkdir -p .vcpkg
             touch .vcpkg/vcpkg.path.txt
           else
-            echo "VCPKG_OUTPUT_PATH=$GITHUB_WORKSPACE/vcpkg/installed/x64-linux" >> $GITHUB_ENV
             cd $GITHUB_WORKSPACE
             mkdir -p .vcpkg
             touch .vcpkg/vcpkg.path.txt
@@ -112,7 +113,7 @@ jobs:
           cd vcpkg
           ./bootstrap-vcpkg.sh -disableMetrics
           ./vcpkg integrate install
-          ./vcpkg install tbb${{matrix.vcpktriplet}}
+          ./vcpkg install tbb:${{matrix.vcpkgtriplet}}
       - name: Install libcuckoo
         run: |
           cd $GITHUB_WORKSPACE
@@ -125,7 +126,7 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           ${{matrix.compiler}} --version
-          ${{matrix.compiler}} ${{matrix.sourcefile}} ${{matrix.architecture}} ${{matrix.compileroptions}} -o ${{matrix.outputfile}} -I$GITHUB_WORKSPACE/boost-root -I$VCPKG_OUTPUT_PATH/include -I$GITHUB_WORKSPACE/libcuckoo-root/libcuckoo -I$GITHUB_WORKSPACE/gtl-root/include -L$VCPKG_OUTPUT_PATH/lib -pthread -ltbb -ltbbmalloc
+          ${{matrix.compiler}} ${{matrix.sourcefile}} ${{matrix.architecture}} ${{matrix.compileroptions}} -o ${{matrix.outputfile}} -I$GITHUB_WORKSPACE/boost-root -I$GITHUB_WORKSPACE/vcpkg/installed/${{matrix.vcpkgtriplet}}/include -I$GITHUB_WORKSPACE/libcuckoo-root/libcuckoo -I$GITHUB_WORKSPACE/gtl-root/include -L$GITHUB_WORKSPACE/vcpkg/installed/${{matrix.vcpkgtriplet}}/lib -pthread -ltbb -ltbbmalloc
       - name: Set reportfile name
         run: |
           echo "REPORT_FILE=${{matrix.reportdir}}/${{matrix.sourcefile}}.txt" >> $GITHUB_ENV