Skip to content

Commit 0d8520e

Browse files
committed
[GitHub Actions] Set VCPKG_DEFAULT_HOST_TRIPLET in more cases
1 parent 651b5f9 commit 0d8520e

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.github/workflows/CI_emscripten.yml

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848
env:
4949
WZ_WASM_ARCH: '${{ matrix.arch }}'
50+
VCPKG_DEFAULT_HOST_TRIPLET: 'x64-linux' # based on the runs-on line above
5051
if: "!contains(github.event.head_commit.message, '[ci skip]')"
5152
outputs:
5253
# Needed by the release + other later jobs - despite this being a matrix job, this should be the same for all, so we can allow whatever is last to persist it

.github/workflows/CI_macos.yml

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
image: "macos-13"
3434
osx_target_arch: "x86_64"
3535
vcpkg_triplet: "x64-osx"
36+
vcpkg_host_triplet: "x64-osx"
3637
xcode_dev_dir: "/Applications/Xcode_14.3.1.app"
3738
include_videos: false
3839
artifact_suffix: "x64"
@@ -41,6 +42,7 @@ jobs:
4142
image: "macos-13"
4243
osx_target_arch: "arm64"
4344
vcpkg_triplet: "arm64-osx"
45+
vcpkg_host_triplet: "x64-osx"
4446
xcode_dev_dir: "/Applications/Xcode_14.3.1.app"
4547
include_videos: true
4648
artifact_suffix: "arm64"
@@ -58,6 +60,7 @@ jobs:
5860
WZ_INCLUDE_VIDEOS: '${{ matrix.include_videos }}'
5961
WZ_OSX_TARGET_ARCH: '${{ matrix.osx_target_arch }}'
6062
VCPKG_DEFAULT_TRIPLET: '${{ matrix.vcpkg_triplet }}'
63+
VCPKG_DEFAULT_HOST_TRIPLET: '${{ matrix.vcpkg_host_triplet }}'
6164
ARCHS: '${{ matrix.osx_target_arch }}'
6265
steps:
6366
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)