Skip to content

Commit 25d9074

Browse files
authored
Merge pull request #1230 from PatKamin/fix-tbb-vcpkg
Fix vcpkg tbb installation
2 parents e3d2929 + 99d5347 commit 25d9074

7 files changed

+16
-16
lines changed

.github/workflows/nightly.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ jobs:
123123
env:
124124
VCPKG_PATH: ${{env.VCPKG_PATH}}
125125
with:
126-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
126+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
127127
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
128128
vcpkgJsonGlob: '**/vcpkg.json'
129129

130130
- name: Install dependencies
131-
run: vcpkg install
131+
run: vcpkg install --triplet x64-windows
132132

133133
- name: Install Ninja
134134
if: matrix.generator == 'Ninja'
@@ -190,12 +190,12 @@ jobs:
190190
- name: Initialize vcpkg
191191
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
192192
with:
193-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
193+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
194194
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
195195
vcpkgJsonGlob: '**/vcpkg.json'
196196

197197
- name: Install dependencies
198-
run: vcpkg install
198+
run: vcpkg install --triplet x64-windows
199199

200200
- name: Install Ninja
201201
uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # v5

.github/workflows/reusable_basic.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,12 @@ jobs:
260260
- name: Initialize vcpkg
261261
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
262262
with:
263-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
263+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
264264
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
265265
vcpkgJsonGlob: '**/vcpkg.json'
266266

267267
- name: Install dependencies
268-
run: vcpkg install
268+
run: vcpkg install --triplet x64-windows
269269
shell: pwsh # Specifies PowerShell as the shell for running the script.
270270

271271
- name: Get UMF version

.github/workflows/reusable_codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ jobs:
4848
if: matrix.os == 'windows-latest'
4949
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
5050
with:
51-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
51+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
5252
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
5353
vcpkgJsonGlob: '**/vcpkg.json'
5454

5555
- name: "[Win] Install dependencies"
5656
if: matrix.os == 'windows-latest'
5757
run: |
58-
vcpkg install
58+
vcpkg install --triplet x64-windows
5959
python3 -m pip install -r third_party/requirements.txt
6060
6161
- name: "[Lin] Install apt packages"

.github/workflows/reusable_compatibility.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ jobs:
120120
- name: Initialize vcpkg
121121
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
122122
with:
123-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
123+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
124124
vcpkgDirectory: ${{github.workspace}}/vcpkg
125125
vcpkgJsonGlob: '**/vcpkg.json'
126126

127127
# NOTE we use vcpkg setup from "tag" version
128128
- name: Install dependencies
129129
working-directory: ${{github.workspace}}/tag_version
130-
run: vcpkg install
130+
run: vcpkg install --triplet x64-windows
131131
shell: pwsh # Specifies PowerShell as the shell for running the script.
132132

133133
- name: Configure "tag" UMF build

.github/workflows/reusable_fast.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ jobs:
6060
if: matrix.os == 'windows-latest'
6161
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
6262
with:
63-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
63+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
6464
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
6565
vcpkgJsonGlob: '**/vcpkg.json'
6666

6767
- name: Install dependencies (windows-latest)
6868
if: matrix.os == 'windows-latest'
69-
run: vcpkg install
69+
run: vcpkg install --triplet x64-windows
7070
shell: pwsh # Specifies PowerShell as the shell for running the script.
7171

7272
- name: Install dependencies

.github/workflows/reusable_gpu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ jobs:
8080
if: matrix.os == 'Windows'
8181
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
8282
with:
83-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
83+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
8484
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
8585
vcpkgJsonGlob: '**/vcpkg.json'
8686

8787
- name: "[Win] Install dependencies"
8888
if: matrix.os == 'Windows'
89-
run: vcpkg install
89+
run: vcpkg install --triplet x64-windows
9090

9191
# note: disable all providers except the one being tested
9292
# '-DCMAKE_SUPPRESS_REGENERATION=ON' is the WA for the error: "CUSTOMBUILD : CMake error : Cannot restore timestamp"

.github/workflows/reusable_sanitizers.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ jobs:
106106
- name: Initialize vcpkg
107107
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
108108
with:
109-
vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
109+
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
110110
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
111111
vcpkgJsonGlob: '**/vcpkg.json'
112112

113113
- name: Install dependencies
114-
run: vcpkg install
114+
run: vcpkg install --triplet x64-windows
115115
shell: pwsh # Specifies PowerShell as the shell for running the script.
116116

117117
# TODO enable level zero provider

0 commit comments

Comments
 (0)