diff --git a/.travis.yml b/.travis.yml index 7cc02ab..84a7264 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,12 @@ services: sudo: required dist: trusty -osx_image: xcode10 +osx_image: xcode10.1 env: global: - QPMX_CACHE_DIR=$HOME/.qpmx-cache - - QT_VER=5.11.2 + - QT_VER=5.12.0 - DOCKER_IMAGE=base matrix: @@ -20,6 +20,9 @@ matrix: - PLATFORM=gcc_64 # - BUILD_DOC=true - BUILD_EXAMPLES=true + - os: linux + env: + - PLATFORM=android_arm64_v8a - os: linux env: - PLATFORM=android_armv7 diff --git a/appveyor.yml b/appveyor.yml index 9a0baf2..fa4e2de 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,30 +5,27 @@ image: version: build-{build} environment: - QT_VER: 5.11.2 + QT_VER: 5.12.0 matrix: - PLATFORM: msvc2017_64 - - PLATFORM: mingw53_32 + - PLATFORM: mingw73_64 - PLATFORM: winrt_x64_msvc2017 - PLATFORM: winrt_armv7_msvc2017 - PLATFORM: msvc2015_64 - - PLATFORM: msvc2015 matrix: exclude: - PLATFORM: msvc2017_64 image: Visual Studio 2015 + - PLATFORM: mingw73_64 + image: Visual Studio 2015 - PLATFORM: winrt_x64_msvc2017 image: Visual Studio 2015 - PLATFORM: winrt_armv7_msvc2017 image: Visual Studio 2015 - - PLATFORM: mingw53_32 - image: Visual Studio 2015 - PLATFORM: msvc2015_64 image: Visual Studio 2017 - - PLATFORM: msvc2015 - image: Visual Studio 2017 install: - git clone https://github.com/Skycoder42/QtModules.git .\qtmodules-travis