diff options
Diffstat (limited to 'coin/provisioning/common/macos')
-rwxr-xr-x | coin/provisioning/common/macos/docker.sh | 75 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/install_openssl.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/python2.sh | 8 |
3 files changed, 6 insertions, 81 deletions
diff --git a/coin/provisioning/common/macos/docker.sh b/coin/provisioning/common/macos/docker.sh deleted file mode 100755 index 5ad7dcba..00000000 --- a/coin/provisioning/common/macos/docker.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# Download and install the Docker Toolbox for macOS (Docker Compose and Docker Machine). -url="https://download.docker.com/mac/stable/DockerToolbox.pkg" -target_file="DockerToolbox.pkg" - -if [ -x "$(command -v sha1sum)" ] -then - # This part shall be used in CI environment only. The DownloadURL script needs sha1sum - # which is not included in the default macOS system. In addition, the cached pkg can't - # be downloaded out of the Qt internal network. - case ${BASH_SOURCE[0]} in - */macos/*) UNIX_PATH="${BASH_SOURCE[0]%/macos/*}/unix" ;; - */*) UNIX_PATH="${BASH_SOURCE[0]%/*}/../unix" ;; - *) UNIX_PATH="../unix" ;; - esac - - source "$UNIX_PATH/DownloadURL.sh" - url_cached="http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.pkg" - sha1="7196d2d30648d486978d29adb5837ff7876517c1" - DownloadURL $url_cached $url $sha1 $target_file -else - curl $url -o $target_file -fi -sudo installer -pkg $target_file -target / -docker --version -docker-compose --version - -# Start testserver provisioning -case ${BASH_SOURCE[0]} in - */macos/*) SERVER_PATH="${BASH_SOURCE[0]%/macos/*}/shared/testserver" ;; - */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;; - *) SERVER_PATH="../shared/testserver" ;; -esac - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -case $(sysctl machdep.cpu.features) in - *VMX*) "$SERVER_PATH/docker_testserver.sh" VMX ;; - *) echo "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." >&2; exit 1 ;; -esac diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh index 15f02ffd..3b1978e2 100755 --- a/coin/provisioning/common/macos/install_openssl.sh +++ b/coin/provisioning/common/macos/install_openssl.sh @@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem +security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null +security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null sudo rm -rf /tmp/openssl-$opensslVersion diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh index f4016f8d..4ab914de 100755 --- a/coin/provisioning/common/macos/python2.sh +++ b/coin/provisioning/common/macos/python2.sh @@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" -SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg" +SHA1="895a8327a58e7c0e58852638ab3d84843643535b" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" @@ -55,5 +55,5 @@ InstallPip python2.7 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" -echo "python2 = 2.7.14" >> ~/versions.txt +echo "python2 = 2.7.16" >> ~/versions.txt |