Skip to content

Commit

Permalink
update mac, linux docker qtio builds to 5.12.10. (GPSBabel#650)
Browse files Browse the repository at this point in the history
* update mac Qt 5.12 build to 5.12.10.

* update qtio docker build to qt 5.12.10
  • Loading branch information
tsteven4 authored Nov 10, 2020
1 parent 698f459 commit 6e1bbc5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
osx_image: xcode10.3
compiler: clang
env:
- QT_VERSION="5.12.9"
- QT_VERSION="5.12.10"
- QT_INSTALL_METHOD="installer"
cache:
directories:
Expand Down Expand Up @@ -116,7 +116,7 @@ script:
after_success:
- cd ${TRAVIS_BUILD_DIR}
# only deploy pushes to master or prs that target master. the prs will go to transfr.sh, the pushes go to github.
- if [ "${TRAVIS_OS_NAME}" = "osx" ] && [ "${QT_VERSION}" = "5.12.9" ] && [ "$TRAVIS_BRANCH" = "master" ]; then bash ./tools/uploadtool/upload.sh gui/GPSBabel-*.dmg; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ] && [ "${QT_VERSION}" = "5.12.10" ] && [ "$TRAVIS_BRANCH" = "master" ]; then bash ./tools/uploadtool/upload.sh gui/GPSBabel-*.dmg; fi

branches:
except:
Expand Down
2 changes: 1 addition & 1 deletion tools/make_docker_qtio_image
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
versuffix=_qtio
tag=$(date -u +%Y%m%dT%H%M%SZ)

QT_VERSION=5.12.9
QT_VERSION=5.12.10
QT_VERSION_SHORT=${QT_VERSION//./}
QT_CI_PACKAGES="qt.qt5.${QT_VERSION_SHORT}.gcc_64,qt.qt5.${QT_VERSION_SHORT}.qtwebengine"
DOWNLOAD_URL=$(./qtci/find_qt_installer ${QT_VERSION})
Expand Down

0 comments on commit 6e1bbc5

Please sign in to comment.