lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-19 03:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into dev

Browse Source 
Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
This commit is contained in:
Liang Qi
2018-08-06 11:31:33 +02:00
parent a43a23f7d1 00730d1caf
commit d746bc3ea8
9 changed files with 98 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/unix/mqtt_broker.sh
View File

@@ -39,10 +39,10 @@
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
CommitSHA="ef4dbc182ddd06247e4b2618d5ad0a57df12ab25"
CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
SHA1="ba2b7d05afe4e13446d40cd4e753dda7f325a587"
SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd"
targetFolder="/opt/paho_broker"
appPrefix="paho.mqtt.testing-$CommitSHA"

8
coin/provisioning/common/windows/mqtt_broker.ps1
View File

@@ -35,11 +35,11 @@
Write-Host "MQTT: Downloading Paho test broker..."
$zip = Get-DownloadLocation "pahotest.zip"
$commitSHA = "ef4dbc182ddd06247e4b2618d5ad0a57df12ab25"
$sha1 = "ba2b7d05afe4e13446d40cd4e753dda7f325a587"
$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd"
$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1

3
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
View File

@@ -35,6 +35,9 @@
set -ex
# Remove update notifications and packagekit running in the background
sudo yum -y remove PackageKit gnome-software
installPackages=()
installPackages+=(git)
installPackages+=(zlib-devel)

7
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
View File

@@ -169,3 +169,10 @@ pip wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse
EOC