aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-10-08 14:06:34 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2020-10-08 21:31:29 +0300
commitaee06febca2305b9442c5a43d6648ead5b28e4d4 (patch)
tree29090c1927a33d9761c33c8fe9b14580baaab06b
parent3c279560176f427b651b2163d56d5b67c2c48b4c (diff)
Provisioning: Install Ninja binary
Install Ninja binary without using brew Pick-to: 5.15 Pick-to: 5.12 Task-number: QTQAINFRA-3954 Change-Id: I2f50814e26e756bbf5cf3d74a4a1c5c00426ab4a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/common/macos/ninja.sh49
-rwxr-xr-xcoin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh5
2 files changed, 53 insertions, 1 deletions
diff --git a/coin/provisioning/common/macos/ninja.sh b/coin/provisioning/common/macos/ninja.sh
new file mode 100755
index 00000000..9b689647
--- /dev/null
+++ b/coin/provisioning/common/macos/ninja.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2020 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 will install ninja binary
+
+# shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+
+version="1.10.1"
+internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
+externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
+SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
+DestDir="/usr/local/bin/"
+
+InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""
+
+echo "Ninja = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh
index c9d3e309..08428b2f 100755
--- a/coin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh
@@ -2,4 +2,7 @@
set -ex
-brew install ninja
+# shellcheck source=../common/macos/ninja.sh
+source "${BASH_SOURCE%/*}/../common/macos/ninja.sh"
+
+