From ed82b7ec6f2d3d46d2bdc522f5bb27b7be33127f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 2 Oct 2025 12:44:29 +0200 Subject: [PATCH] Remove QNX provisioning from macOS Apple Silicon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The toolchain is x86_64 only, which trips up xcodebuild if Rosetta2 is not installed: https://github.com/swiftlang/swift-build/issues/836 We don't have any CI configurations that build QNX on macOS, so we don't need to install it. Pick-to: 6.10 6.8 6.5 Change-Id: I8714438c6373e613f28f67b48d2f4f78a723bc9d Reviewed-by: Jukka Jokiniva Reviewed-by: Marianne Yrjänä --- .../qtci-macos-11-arm/40-qnx700.sh | 25 ------------------- .../qtci-macos-12-arm/40-qnx700.sh | 25 ------------------- .../qtci-macos-13-arm/40-qnx700.sh | 25 ------------------- .../qtci-macos-14-arm/40-qnx700.sh | 25 ------------------- .../qtci-macos-15-arm/40-qnx700.sh | 25 ------------------- .../qtci-macos-26-arm/40-qnx700.sh | 25 ------------------- 6 files changed, 150 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-11-arm/40-qnx700.sh delete mode 100755 coin/provisioning/qtci-macos-12-arm/40-qnx700.sh delete mode 100755 coin/provisioning/qtci-macos-13-arm/40-qnx700.sh delete mode 100755 coin/provisioning/qtci-macos-14-arm/40-qnx700.sh delete mode 100755 coin/provisioning/qtci-macos-15-arm/40-qnx700.sh delete mode 100755 coin/provisioning/qtci-macos-26-arm/40-qnx700.sh diff --git a/coin/provisioning/qtci-macos-11-arm/40-qnx700.sh b/coin/provisioning/qtci-macos-11-arm/40-qnx700.sh deleted file mode 100755 index 48286a67..00000000 --- a/coin/provisioning/qtci-macos-11-arm/40-qnx700.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-12-arm/40-qnx700.sh b/coin/provisioning/qtci-macos-12-arm/40-qnx700.sh deleted file mode 100755 index 48286a67..00000000 --- a/coin/provisioning/qtci-macos-12-arm/40-qnx700.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-13-arm/40-qnx700.sh b/coin/provisioning/qtci-macos-13-arm/40-qnx700.sh deleted file mode 100755 index 48286a67..00000000 --- a/coin/provisioning/qtci-macos-13-arm/40-qnx700.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-14-arm/40-qnx700.sh b/coin/provisioning/qtci-macos-14-arm/40-qnx700.sh deleted file mode 100755 index 48286a67..00000000 --- a/coin/provisioning/qtci-macos-14-arm/40-qnx700.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh b/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh deleted file mode 100755 index 48286a67..00000000 --- a/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-26-arm/40-qnx700.sh b/coin/provisioning/qtci-macos-26-arm/40-qnx700.sh deleted file mode 100755 index 48286a67..00000000 --- a/coin/provisioning/qtci-macos-26-arm/40-qnx700.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo tar -C "$targetFolder" -Jxf $sourceFile - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt