From fd5f44a57bd61805952b9a6a18a64b97409c9537 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Mon, 9 Feb 2026 12:24:40 +0200 Subject: [PATCH] Fix macOS 13 install-vcpkg-ports.sh failing in provisioning Fix vcpkg install to use correct architecture (arm64/x64) as a host when using --host-triplet argument. Pick-to: 6.11 Task-number: QTQAINFRA-7691 Change-Id: I899f6521b47e407e1c9bde1c0f2b83e560894794 Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh | 2 +- .../provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh | 2 +- coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh | 2 +- .../provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh | 2 +- coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh | 2 +- .../provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh index 8f9f44bf..818c70eb 100755 --- a/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") "$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=arm64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \; diff --git a/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh index 8f9f44bf..e7973ee4 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=x64-osx "$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt diff --git a/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh index 8f9f44bf..818c70eb 100755 --- a/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") "$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=arm64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \; diff --git a/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh index 8f9f44bf..e7973ee4 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=x64-osx "$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt diff --git a/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh index 8f9f44bf..818c70eb 100755 --- a/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") "$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=arm64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \; diff --git a/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh index 8f9f44bf..e7973ee4 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=x64-osx "$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt