Skip to content

Commit aaebd30

Browse files
committed
Fix triplet
1 parent 69f45a1 commit aaebd30

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/ci-pr-validation.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292

9393
- name: Build the project
9494
run: |
95-
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TRIPLET=x64-linux-release -DBUILD_TESTS=ON
95+
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TARGET_TRIPLET=x64-linux-release -DBUILD_TESTS=ON
9696
cmake --build build -j8
9797
9898
- name: Tidy check
@@ -119,7 +119,7 @@ jobs:
119119

120120
- name: Build core libraries
121121
run: |
122-
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TRIPLET=x64-linux-release -DBUILD_TESTS=OFF
122+
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TARGET_TRIPLET=x64-linux-release -DBUILD_TESTS=OFF
123123
cmake --build build -j8
124124
125125
- name: Check formatting
@@ -132,7 +132,7 @@ jobs:
132132
133133
- name: Build tests
134134
run: |
135-
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TRIPLET=x64-linux-release -DBUILD_TESTS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
135+
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TARGET_TRIPLET=x64-linux-release -DBUILD_TESTS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
136136
cmake --build build -j8
137137
138138
- name: Install gtest-parallel
@@ -144,13 +144,13 @@ jobs:
144144

145145
- name: Build perf tools
146146
run: |
147-
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TRIPLET=x64-linux-release -DBUILD_TESTS=ON -DBUILD_PERF_TOOLS=ON
147+
cmake -B build -DINTEGRATE_VCPKG=ON -DVCPKG_TARGET_TRIPLET=x64-linux-release -DBUILD_TESTS=ON -DBUILD_PERF_TOOLS=ON
148148
cmake --build build -j8
149149
150150
- name: Verify custom vcpkg installation
151151
run: |
152152
mv vcpkg /tmp/
153-
cmake -B build-2 -DINTEGRATE_VCPKG=ON -DVCPKG_TRIPLET=x64-linux-release -DCMAKE_TOOLCHAIN_FILE="/tmp/vcpkg/scripts/buildsystems/vcpkg.cmake"
153+
cmake -B build-2 -DINTEGRATE_VCPKG=ON -DVCPKG_TARGET_TRIPLET=x64-linux-release -DCMAKE_TOOLCHAIN_FILE="/tmp/vcpkg/scripts/buildsystems/vcpkg.cmake"
154154
155155
cpp20-build:
156156
name: Build with the C++20 standard
@@ -245,7 +245,7 @@ jobs:
245245
-G "${{ matrix.generator }}" ${{ matrix.arch }} \
246246
-DUSE_ASIO=ON \
247247
-DBUILD_TESTS=OFF \
248-
-DVCPKG_TRIPLET="${{ matrix.triplet }}" \
248+
-DVCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
249249
-DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}" \
250250
-S .
251251
fi
@@ -287,7 +287,7 @@ jobs:
287287
-G "${{ matrix.generator }}" ${{ matrix.arch }} \
288288
-DUSE_ASIO=ON \
289289
-DBUILD_TESTS=OFF \
290-
-DVCPKG_TRIPLET="${{ matrix.triplet }}" \
290+
-DVCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
291291
-DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}" \
292292
-DCMAKE_BUILD_TYPE=Debug \
293293
-S .

0 commit comments

Comments
 (0)