mirror of https://github.com/qt/qt5.git
coin: Prepare for removing macOS 10.14 as a supported deployment target
Change-Id: I9fcee3df2d9bfeb8f920df8a30e3e1b556874fd4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
parent
3a0ea2804d
commit
ffd7bc3bd7
|
@ -33,12 +33,6 @@ Configurations:
|
|||
|
||||
# Test on all supported macOS versions (deployment targets)
|
||||
|
||||
-
|
||||
Id: 'macos-10.14-x86_64-tests'
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
|
||||
-
|
||||
Id: 'macos-10.15-x86_64-tests'
|
||||
Template: 'qtci-macos-10.15-x86_64-102'
|
||||
|
@ -109,12 +103,6 @@ Configurations:
|
|||
|
||||
# Test on all supported macOS versions (deployment targets)
|
||||
|
||||
-
|
||||
Id: 'macos-10.14-x86_64-developer-build-tests'
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
|
||||
-
|
||||
Id: 'macos-10.15-x86_64-developer-build-tests'
|
||||
Template: 'qtci-macos-10.15-x86_64-102'
|
||||
|
|
|
@ -28,7 +28,7 @@ Configurations:
|
|||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Template: 'qtci-macos-10.15-x86_64-1022'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
|
|
|
@ -86,13 +86,13 @@ if [ "$os" == "linux" ]; then
|
|||
|
||||
elif [ "$os" == "macos" ]; then
|
||||
brew install yasm
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.14
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||
build_ffmpeg
|
||||
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
|
||||
|
||||
elif [ "$os" == "macos-universal" ]; then
|
||||
brew install yasm
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.14
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||
build_ffmpeg "arm64"
|
||||
build_ffmpeg "x86_64"
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
|
|||
|
||||
commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"
|
||||
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.14
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||
|
||||
opensslBuild="${opensslHome}-build"
|
||||
opensslDestdir="${opensslHome}-destdir"
|
||||
|
|
Loading…
Reference in New Issue