diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
commit | 74eb853384473dbe18123f9731b6f9529d68d2cf (patch) | |
tree | af5f2be1057f4a80f331bb5d81caa0af6c35aac8 /coin/provisioning/common/python.ps1 | |
parent | c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea (diff) | |
parent | 5df417aeb9fe5fa8b8613abdd3b32bc79e32f49e (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
Diffstat (limited to 'coin/provisioning/common/python.ps1')
-rw-r--r-- | coin/provisioning/common/python.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index ef4be200..6c88689a 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi" if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" - $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.amd64.msi" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" - $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi" $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } |