mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 11:26:04 +08:00
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
This commit is contained in:
Jani Heikkinen
3
coin/provisioning/common/macos/disable_update_downloads.sh
Executable file
3
coin/provisioning/common/macos/disable_update_downloads.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE
|
||||
|
||||
@@ -40,51 +40,21 @@
|
||||
# If called directly from another script, it will exit the parent script
|
||||
# as well, if not called in its own subshell with parentheses.
|
||||
|
||||
# shellcheck source=try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
|
||||
ExceptionDownloadPrimaryUrl=100
|
||||
ExceptionDownloadAltUrl=101
|
||||
ExceptionSHA1=102
|
||||
|
||||
function DownloadURL {
|
||||
url=$1
|
||||
url_alt=$2
|
||||
expectedSha1=$3
|
||||
targetFile=$4
|
||||
|
||||
try
|
||||
(
|
||||
try
|
||||
(
|
||||
echo "Downloading from primary URL '$url'"
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl
|
||||
)
|
||||
catch || {
|
||||
case $ex_code in
|
||||
$ExceptionDownloadPrimaryUrl)
|
||||
echo "Failed to download '$url' multiple times"
|
||||
echo "Downloading tar.gz from alternative URL '$url_alt'"
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
|
||||
;;
|
||||
esac
|
||||
}
|
||||
echo "Checking SHA1 on PKG '$targetFile'"
|
||||
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
|
||||
sha1sum --check $targetFile.sha1 || throw $ExceptionSHA1
|
||||
echo "Downloading from primary URL '$url'"
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
|
||||
echo "Failed to download '$url' multiple times"
|
||||
echo "Downloading from alternative URL '$url_alt'"
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
|
||||
)
|
||||
|
||||
catch || {
|
||||
case $ex_code in
|
||||
$ExceptionDownloadAltUrl)
|
||||
echo "Failed downloading PKG from primary and alternative URLs"
|
||||
exit 1;
|
||||
;;
|
||||
$ExceptionSHA1)
|
||||
echo "Failed checksum on $targetFile."
|
||||
exit 1;
|
||||
;;
|
||||
esac
|
||||
}
|
||||
echo "Checking SHA1 on PKG '$targetFile'"
|
||||
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
|
||||
sha1sum --check $targetFile.sha1
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#############################################################################
|
||||
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../http_proxy.txt"
|
||||
source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
|
||||
|
||||
try
|
||||
(
|
||||
|
||||
@@ -91,7 +91,7 @@ SdkUpdate $sdkFolder platform-tools
|
||||
SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion
|
||||
|
||||
# kill adb. This process prevents provisioning to continue
|
||||
$p = Get-Process -Name "adb.exe" -ErrorAction:SilentlyContinue
|
||||
$p = Get-Process -Name "adb" -ErrorAction:SilentlyContinue
|
||||
if ($p -ne $null) {
|
||||
Write-Host "Stopping adb.exe"
|
||||
Stop-Process -Force $p
|
||||
|
||||
35
coin/provisioning/common/windows/disable-autoreboot.ps1
Normal file
35
coin/provisioning/common/windows/disable-autoreboot.ps1
Normal file
@@ -0,0 +1,35 @@
|
||||
############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
Get-WmiObject Win32_OSRecoveryConfiguration -EnableAllPrivileges | Set-WmiInstance -Arguments @{ AutoReboot=$False }
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
$n = Get-Content "$PSScriptRoot\..\http_proxy.txt"
|
||||
$n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt"
|
||||
$n = $n.Split('=')
|
||||
New-Variable -Name $n[0] -Value $n[1]
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
|
||||
source $BASEDIR/../common/shared/network_test_server_ip.txt
|
||||
|
||||
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
|
||||
@@ -50,7 +49,3 @@ export DISPLAY=:0
|
||||
gsettings set org.gnome.desktop.screensaver lock-enabled false
|
||||
# disable blank screen power saving
|
||||
gsettings set org.gnome.desktop.session idle-delay 0
|
||||
|
||||
if [ "$http_proxy" != "" ]; then
|
||||
echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
|
||||
fi
|
||||
|
||||
@@ -35,4 +35,38 @@
|
||||
|
||||
set -ex
|
||||
|
||||
sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms
|
||||
sudo subscription-manager config --rhsm.manage_repos=0
|
||||
sudo subscription-manager refresh
|
||||
|
||||
sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
|
||||
[rhel-7-workstation-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 7 Workstation (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[rhel-7-workstation-optional-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-optional-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 7 Workstation - Optional (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[rhel-workstation-rhscl-7-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-workstation-rhscl-7-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Software Collections RPMs for Red Hat Enterprise Linux 7 Workstation
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
EOC
|
||||
|
||||
sudo yum clean all
|
||||
# As well as this fetching the repository data, we also get a printout of the used repos
|
||||
sudo yum repolist
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
set -ex
|
||||
|
||||
sudo yum-config-manager --enable rhel-server-rhscl7-rpms
|
||||
sudo yum -y install devtoolset-4
|
||||
|
||||
echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc
|
||||
|
||||
@@ -47,7 +47,7 @@ OfficialUrlPip="https://bootstrap.pypa.io/$packagePip"
|
||||
CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip"
|
||||
SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d"
|
||||
|
||||
DownloadURL $OfficialUrlPip $CachedUrlPip $SHA1Pip ./$packagePip
|
||||
DownloadURL $CachedUrlPip $OfficialUrlPip $SHA1Pip ./$packagePip
|
||||
sudo python3 $packagePip
|
||||
sudo rm -f $packagePip
|
||||
sudo pip3 install virtualenv
|
||||
|
||||
@@ -7,9 +7,6 @@ source $BASEDIR/../common/shared/network_test_server_ip.txt
|
||||
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
|
||||
|
||||
sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
|
||||
echo "Set grub timeout to 0"
|
||||
sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
|
||||
sudo update-grub
|
||||
|
||||
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
|
||||
echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
|
||||
|
||||
4
coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh
Executable file
4
coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/macos/disable_update_downloads.sh
|
||||
4
coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh
Executable file
4
coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/macos/disable_update_downloads.sh
|
||||
4
coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh
Executable file
4
coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/macos/disable_update_downloads.sh
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1"
|
||||
Reference in New Issue
Block a user