From 99d53474dafab3c77f903abf7011d780b1b181cd Mon Sep 17 00:00:00 2001
From: Patryk Kaminski <patryk.kaminski@intel.com>
Date: Tue, 1 Apr 2025 09:10:40 +0200
Subject: [PATCH] Fix vcpkg tbb installation
---
.github/workflows/nightly.yml | 8 ++++----
.github/workflows/reusable_basic.yml | 4 ++--
.github/workflows/reusable_codeql.yml | 4 ++--
.github/workflows/reusable_compatibility.yml | 4 ++--
.github/workflows/reusable_fast.yml | 4 ++--
.github/workflows/reusable_gpu.yml | 4 ++--
.github/workflows/reusable_sanitizers.yml | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c763fd77a..826996832 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -123,12 +123,12 @@ jobs:
env:
VCPKG_PATH: ${{env.VCPKG_PATH}}
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
- name: Install dependencies
- run: vcpkg install
+ run: vcpkg install --triplet x64-windows
- name: Install Ninja
if: matrix.generator == 'Ninja'
@@ -190,12 +190,12 @@ jobs:
- name: Initialize vcpkg
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
- name: Install dependencies
- run: vcpkg install
+ run: vcpkg install --triplet x64-windows
- name: Install Ninja
uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # v5
diff --git a/.github/workflows/reusable_basic.yml b/.github/workflows/reusable_basic.yml
index 816c45a7a..b30bfed4c 100644
--- a/.github/workflows/reusable_basic.yml
+++ b/.github/workflows/reusable_basic.yml
@@ -260,12 +260,12 @@ jobs:
- name: Initialize vcpkg
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
- name: Install dependencies
- run: vcpkg install
+ run: vcpkg install --triplet x64-windows
shell: pwsh # Specifies PowerShell as the shell for running the script.
- name: Get UMF version
diff --git a/.github/workflows/reusable_codeql.yml b/.github/workflows/reusable_codeql.yml
index 046c32081..252e70eee 100644
--- a/.github/workflows/reusable_codeql.yml
+++ b/.github/workflows/reusable_codeql.yml
@@ -48,14 +48,14 @@ jobs:
if: matrix.os == 'windows-latest'
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
- name: "[Win] Install dependencies"
if: matrix.os == 'windows-latest'
run: |
- vcpkg install
+ vcpkg install --triplet x64-windows
python3 -m pip install -r third_party/requirements.txt
- name: "[Lin] Install apt packages"
diff --git a/.github/workflows/reusable_compatibility.yml b/.github/workflows/reusable_compatibility.yml
index 552bbb7b6..48264633d 100644
--- a/.github/workflows/reusable_compatibility.yml
+++ b/.github/workflows/reusable_compatibility.yml
@@ -120,14 +120,14 @@ jobs:
- name: Initialize vcpkg
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{github.workspace}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
# NOTE we use vcpkg setup from "tag" version
- name: Install dependencies
working-directory: ${{github.workspace}}/tag_version
- run: vcpkg install
+ run: vcpkg install --triplet x64-windows
shell: pwsh # Specifies PowerShell as the shell for running the script.
- name: Configure "tag" UMF build
diff --git a/.github/workflows/reusable_fast.yml b/.github/workflows/reusable_fast.yml
index 90a8f023f..7b1087ed0 100644
--- a/.github/workflows/reusable_fast.yml
+++ b/.github/workflows/reusable_fast.yml
@@ -60,13 +60,13 @@ jobs:
if: matrix.os == 'windows-latest'
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
- name: Install dependencies (windows-latest)
if: matrix.os == 'windows-latest'
- run: vcpkg install
+ run: vcpkg install --triplet x64-windows
shell: pwsh # Specifies PowerShell as the shell for running the script.
- name: Install dependencies
diff --git a/.github/workflows/reusable_gpu.yml b/.github/workflows/reusable_gpu.yml
index cce99c64c..b7f671363 100644
--- a/.github/workflows/reusable_gpu.yml
+++ b/.github/workflows/reusable_gpu.yml
@@ -80,13 +80,13 @@ jobs:
if: matrix.os == 'Windows'
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
- name: "[Win] Install dependencies"
if: matrix.os == 'Windows'
- run: vcpkg install
+ run: vcpkg install --triplet x64-windows
# note: disable all providers except the one being tested
# '-DCMAKE_SUPPRESS_REGENERATION=ON' is the WA for the error: "CUSTOMBUILD : CMake error : Cannot restore timestamp"
diff --git a/.github/workflows/reusable_sanitizers.yml b/.github/workflows/reusable_sanitizers.yml
index 1a044308e..c74448e1d 100644
--- a/.github/workflows/reusable_sanitizers.yml
+++ b/.github/workflows/reusable_sanitizers.yml
@@ -106,12 +106,12 @@ jobs:
- name: Initialize vcpkg
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
with:
- vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+ vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
vcpkgJsonGlob: '**/vcpkg.json'
- name: Install dependencies
- run: vcpkg install
+ run: vcpkg install --triplet x64-windows
shell: pwsh # Specifies PowerShell as the shell for running the script.
# TODO enable level zero provider