diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-02-13 20:18:13 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-02-15 10:01:50 +0000 |
| commit | 0c00b1666f2bb74120f8fbaa38a347bf0114bef5 (patch) | |
| tree | d0d0ac992244a71172318decd2119f9c150e8e12 /.travis.yml | |
| parent | b658de2fa798cdf4046608b183137905df636d7b (diff) | |
travis: avoid aborting the build on slow Qt installations
Periodically report the installation status to avoid aborting the
installation on slow Qt installations (possibly due to slow network?).
Change-Id: I6b8b8db49f2268d557a5ca2e7b1f08b6ea801fd9
Reviewed-on: https://code.wireshark.org/review/32022
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 7e0084fcc2..44653e58a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,14 +107,7 @@ before_install: # Workaround to avoid using perl from git-bash $PATH which lacks modules such as Pod::Usage export CMAKE_PROGRAM_PATH=C:/Strawberry/perl/bin fi - - | - if [ "$TRAVIS_OS_NAME" == "windows" ] && [ ! -e "$QT5_BASE_DIR/bin/moc.exe" ]; then - curl -vLo ~/qt-unified-windows-x86-online.exe http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe - if ! ~/qt-unified-windows-x86-online.exe --verbose --script tools/qt-installer-windows.qs > ~/qt-installer-output.txt; then - cat ~/qt-installer-output.txt; exit 1 - fi - du -sm "$QT5_BASE_DIR" - fi + - if [ "$TRAVIS_OS_NAME" == "windows" ]; then tools/travis-install-qt-windows.sh; fi # all platforms - pip3 install pytest pytest-xdist before_script: |