From 19f8a741f3556271dc4ef598bbf725f89b733b6a Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 11:12:09 +0200 Subject: Make provisioning script prefix style match across platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are using different styles and amount of digits for the provisioning script prefixes. This change will unify them across the platforms. Also removes a couple of duplicate files. Task-number: QTQAINFRA-1668 Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../qtci-macos-10.12-x86_64/025-mysql.sh | 56 ---------------------- 1 file changed, 56 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh (limited to 'coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh') diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh deleted file mode 100755 index 0ccd34f9..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -# This script installs MySQL - -# MySQL is needed for Qt to be able to support MySQL - -set -ex - -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" -AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" -SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" -appPrefix="" -targetDir="/opt/mysql57/" - -sudo mkdir -p "/opt" - -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" - -echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc -echo "MySQL = 5.7.15" >> ~/versions.txt -- cgit v1.2.3