diff options
author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/provisioning/qtci-osx-10.11-x86_64 | |
parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/provisioning/qtci-osx-10.11-x86_64')
4 files changed, 4 insertions, 4 deletions
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh index dcd8fead..8a3999b9 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/XZ.pkg" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" DestDir="/" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh index 7555c752..37acc2ee 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -50,4 +50,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/install_xcode.sh source "${BASH_SOURCE%/*}/../common/install_xcode.sh" -InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.2.xz 8.2 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh index 4d938890..1e4de16a 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/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="" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh index 381fedf2..a990829e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" appPrefix="" |