From e19ea33f09ca95364955e6c240d5b6b921e7e73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 8 Apr 2025 22:42:24 +0200 Subject: [PATCH] Bump build host for macOS to macOS 15 Which gets us Xcode 16, with the macOS 15 SDK. Pick-to: 6.9 Change-Id: I755c27f64f903b281f5d1c7947fbf370ddc3ee17 Reviewed-by: Tero Heikkinen --- coin/platform_configs/macos.yaml | 2 +- coin/provisioning/qtci-macos-15-arm/25-python.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index c7e51953..9ea1b6f5 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -9,7 +9,7 @@ Configurations: - Id: 'macos-universal-on-arm64' - Template: 'qtci-macos-14-arm-106' + Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] diff --git a/coin/provisioning/qtci-macos-15-arm/25-python.sh b/coin/provisioning/qtci-macos-15-arm/25-python.sh index 36bbc0e1..37c61881 100755 --- a/coin/provisioning/qtci-macos-15-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-15-arm/25-python.sh @@ -18,4 +18,9 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" # Use 3.9 as a default python SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" + echo "python3 = 3.9.7" >> ~/versions.txt