From 3f7b7987fa414a51dc3cc2f12dd5fc418a575653 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Tue, 25 Jun 2019 10:44:13 +0200 Subject: [PATCH] update ci to 5.13.0 --- .travis.yml | 13 ++++++++----- appveyor.yml | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff1304d..5519eef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,12 @@ services: sudo: required dist: trusty -osx_image: xcode10.1 +osx_image: xcode10.2 env: global: - QDEP_CACHE_DIR=$HOME/.qdep-cache - - QT_VER=5.12.3 + - QT_VER=5.13.0 - DOCKER_IMAGE=datasync - EXTRA_MODULES=".skycoder42.datasync" - MAKE_RUN_TESTS=true @@ -25,17 +25,20 @@ matrix: - BUILD_EXAMPLES=true - os: linux env: - - PLATFORM=emscripten - - DOCKER_IMAGE=common + - PLATFORM=android_arm64_v8a - os: linux env: - - PLATFORM=android_arm64_v8a + - PLATFORM=android_x86_64 - os: linux env: - PLATFORM=android_armv7 - os: linux env: - PLATFORM=android_x86 + - os: linux + env: + - PLATFORM=wasm_32 + - DOCKER_IMAGE=common - os: osx env: - PLATFORM=clang_64 diff --git a/appveyor.yml b/appveyor.yml index 119fe3d..0146d7a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ image: version: build-{build} environment: - QT_VER: 5.12.3 + QT_VER: 5.13.0 EXTRA_MODULES: .skycoder42.datasync MAKE_RUN_TESTS: true TARGET_NAME: qtmvvm