mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Provisioning: Remove macOS 11 and bump minimum targets to 12
Drop macOS 11 out from dev (6.8) branch as it is EOL or very near it. This removes macOS 11 test configurations and bumps macOS targets to 12 in provision scripts. Task-number: QTQAINFRA-6009 Change-Id: I2ea2764fb4a14eb508e39330acfc0947b94343fc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
committed by
Tor Arne Vestbø
parent
34b96646ac
commit
8e8af54d12
@@ -37,12 +37,6 @@ Configurations:
|
||||
|
||||
# On x86_64
|
||||
|
||||
-
|
||||
Id: 'macos-11-x86_64-tests'
|
||||
Template: 'qtci-macos-11-x86_64-106'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-x86_64'
|
||||
-
|
||||
Id: 'macos-12-x86_64-tests'
|
||||
Template: 'qtci-macos-12-x86_64-106'
|
||||
@@ -140,13 +134,6 @@ Configurations:
|
||||
]
|
||||
|
||||
# Test on all supported macOS versions (deployment targets)
|
||||
|
||||
-
|
||||
Id: 'macos-11-arm64-developer-build-tests'
|
||||
Template: 'qtci-macos-11.0-arm64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly']
|
||||
Platform dependency: 'macos-13-arm64-developer-build'
|
||||
-
|
||||
Id: 'macos-12-arm64-developer-build-tests'
|
||||
Template: 'qtci-macos-12-arm64'
|
||||
|
||||
@@ -84,14 +84,14 @@ if [ "$os" == "linux" ]; then
|
||||
|
||||
elif [ "$os" == "macos" ]; then
|
||||
brew install yasm
|
||||
export MACOSX_DEPLOYMENT_TARGET=11
|
||||
export MACOSX_DEPLOYMENT_TARGET=12
|
||||
build_ffmpeg
|
||||
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
|
||||
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
|
||||
|
||||
elif [ "$os" == "macos-universal" ]; then
|
||||
brew install yasm
|
||||
export MACOSX_DEPLOYMENT_TARGET=11
|
||||
export MACOSX_DEPLOYMENT_TARGET=12
|
||||
build_ffmpeg "arm64"
|
||||
build_ffmpeg "x86_64"
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
|
||||
|
||||
commonFlags=(no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 "-Wa,--noexecstack")
|
||||
|
||||
export MACOSX_DEPLOYMENT_TARGET=11
|
||||
export MACOSX_DEPLOYMENT_TARGET=12
|
||||
|
||||
opensslBuild="${opensslHome}-build"
|
||||
opensslDestdir="${opensslHome}-destdir"
|
||||
|
||||
@@ -42,7 +42,7 @@ if uname -a |grep -qv "Darwin"; then
|
||||
fi
|
||||
|
||||
if uname -a |grep -q Darwin; then
|
||||
extraCMakeArgs=("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=11)
|
||||
extraCMakeArgs=("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12)
|
||||
SetEnvVar PATH "\$PATH:$installPrefix/bin"
|
||||
fi
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ echo "Configuring and building protobuf"
|
||||
|
||||
installPrefix="/usr/local"
|
||||
if uname -a |grep -q Darwin; then
|
||||
extraCMakeArgs=("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=11)
|
||||
extraCMakeArgs=("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12)
|
||||
SetEnvVar PATH "\$PATH:$installPrefix/bin"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user