diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-08 12:20:08 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-28 23:01:28 +0000 |
| commit | ffd7bc3bd71d0a2ee505bafb2bdaa60e9aab3c82 (patch) | |
| tree | 6a7a32449fcdd8ca3c5a427ae2c33117b905f24d | |
| parent | 3a0ea2804dfb3650e7f5c4f53aef2f9e179b7348 (diff) | |
coin: Prepare for removing macOS 10.14 as a supported deployment target
Change-Id: I9fcee3df2d9bfeb8f920df8a30e3e1b556874fd4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | coin/platform_configs/macos.yaml | 12 | ||||
| -rw-r--r-- | coin/platform_configs/qt-creator.yaml | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 2 |
4 files changed, 4 insertions, 16 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 40bea2fd..9507a634 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -34,12 +34,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' Compiler: 'Clang' @@ -110,12 +104,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' Compiler: 'Clang' diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 130c974f..6fb47237 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -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: '' diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index dedad29a..91929ccb 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -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" diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 221b4435..602c713b 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -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" |