From 355252621c4978f1b02899335d99fd9b371bb88e Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 9 Feb 2018 13:24:11 -0800 Subject: Remove macOS 10.10 from CI for Qt 5.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As agreed, this version will not be supported any longer. Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446 Reviewed-by: Gabriel de Dietrich Reviewed-by: Tor Arne Vestbø --- coin/platform_configs/default.txt | 2 +- .../qtci-osx-10.10-x86_64/01-crashreporter.sh | 5 ---- .../qtci-osx-10.10-x86_64/01-system_updates.sh | 6 ----- .../qtci-osx-10.10-x86_64/02-disable-ntp.sh | 3 --- .../02-disable-screensaver.sh | 28 ---------------------- .../qtci-osx-10.10-x86_64/03-bashprofile.sh | 7 ------ .../provisioning/qtci-osx-10.10-x86_64/04-cmake.sh | 6 ----- .../qtci-osx-10.10-x86_64/08-libclang.sh | 7 ------ .../qtci-osx-10.10-x86_64/25-python3.sh | 4 ---- .../qtci-osx-10.10-x86_64/90-squish.sh | 4 ---- 10 files changed, 1 insertion(+), 71 deletions(-) delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 66193fbc..9ec6a406 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -15,7 +15,7 @@ qtci-linux-RHEL-6.6-x86_64 GCC qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch -qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests +qtci-osx-10.11-x86_64-3 Clang Release NoFramework DisableTests qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh deleted file mode 100755 index 8461c656..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh deleted file mode 100755 index 94b53309..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh deleted file mode 100755 index 356891e1..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh deleted file mode 100755 index e799344a..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -mkdir -p $HOME/Library/LaunchAgents -cat >$HOME/Library/LaunchAgents/no-screensaver.plist < - - - - Label - org.qt.io.screensaver_disable - ProgramArguments - - defaults - -currentHost - write - com.apple.screensaver - idleTime - 0 - - RunAtLoad - - KeepAlive - - - -EOT diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh deleted file mode 100755 index 2c3e45f3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -# Read .bashrc if exist -printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile - diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh deleted file mode 100755 index e5dd1910..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh deleted file mode 100755 index fea11e01..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default -$BASEDIR/../common/unix/libclang.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh deleted file mode 100755 index 92b05bf3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh b/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh deleted file mode 100755 index 27ff15c3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh - -- cgit v1.2.3