lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 03:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Add macOS Monterey (12) x86 to CI

Browse Source 
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Ville-Pekka Karhu
2021-11-01 14:26:33 +02:00
committed by Heikki Halmet
parent 1b1005038b
commit 7e2882d0a7
46 changed files with 822 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/unix/install-openssl.sh
View File

@@ -37,11 +37,11 @@
# Requires GCC and Perl to be in PATH.
set -ex
os="$1"
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.1.1k"
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
@@ -112,7 +112,7 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
echo "Making universal OpenSSL package"
# shellcheck disable=SC2024
sudo rm -Rf "$openssl_install_dir"
sudo ${BASH_SOURCE%/*}/../macos/makeuniversal.sh "$opensslDestdir/x86_64" $opensslDestdir/arm64
sudo ${SCRIPT_DIR}/../macos/makeuniversal.sh "$opensslDestdir/x86_64" $opensslDestdir/arm64
fi
path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')