Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 835bfaf

Browse files
committed
update ci files for 5.11
1 parent 09c02f0 commit 835bfaf

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.travis.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ services:
55

66
sudo: required
77
dist: trusty
8-
osx_image: xcode9.2
8+
osx_image: xcode9.3
99

1010
env:
1111
global:
1212
- QPMX_CACHE_DIR=$HOME/.qpmx-cache
13-
- QT_VER=5.10.1
13+
- QT_VER=5.11.0
14+
- DOCKER_IMAGE=json
1415
- EXTRA_MODULES=".qtremoteobjects .skycoder42.jsonserializer"
15-
- STATIC_QT_MODS="qttools qtwebsockets qtscxml qtremoteobjects"
16-
- STATIC_EXTRA_MODS="qtjsonserializer"
1716

1817
matrix:
1918
include:
2019
- os: linux
2120
env:
2221
- PLATFORM=gcc_64
2322
- BUILD_DOC=true
23+
- BUILD_EXAMPLES=true
2424
- EXTRA_PKG="libsecret-1-dev" #in order to build secrectservice keystore
2525
- os: linux
2626
env:
@@ -38,7 +38,7 @@ matrix:
3838
before_install:
3939
- git clone https://github.com/Skycoder42/QtModules.git ./qtmodules-travis
4040
- ./src/3rdparty/cryptopp/travis.sh
41-
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; else ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; fi
41+
- travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh
4242

4343
script:
4444
- ./tests/ci/setup.sh
@@ -52,15 +52,16 @@ deploy:
5252
api_key:
5353
secure: rlbQDrfTPXKyOBgnixuvnXwl/0G9O89rHe+IEGJuLWc7hfkEYKhDCcjjfONM6dQ/qp3NDYKJYO1FsYgfkjN50IywpHO2Hgmr/2Gg/Bin37kbT7ZPzKqYT2TD1IqTerdNmL7n60YjJtvIDLd/k+9k5xU2TDd1jawiz1pEKkvUKHkBImKhNUk3NX6Ba8d4xbWwAvg3IIg63TI42f0srapZY+jvzbQjiuIqfL+pbByfcPi77NIKtrSJNF0UsLFeeqEYrvd1TsmeObyp566xPH7OZzJ0llomDqmD1leSYUM7bwBMscQai/3BcucygQbX+wx/Z9Ghq4HhXQ+E9nQvhEHwAXgvGB+Rxd/IvtzBRS8VQoDpCyFqEN1xhEE38vvkkTGfxWLDCeTSNsKrZYj6iqPOrOkF6/DFC/L1jSy0BumedhK4+Zi2InvniGSPIk9Gk3PWgJp1MWTzdJ+E3L5WEch4iV+TY3E8ukPCuvTyIQiitm9O+Dfz2FVmT+aMwvL/tHr7w7dG/05fDZj7psXjEGTPdKIfzjf1fUp++AKmg0hjPYXkQRvMg7jHS9R4AYvwVagDleXLZwq7lhmREq1gJL32D806sdN8+9scNKrA6D/ZhHr6j03i6eLoLzL1n17IOfjB6taantmsOeSEV4TKyznMXOY2/Wdm8gIpk0GTn1h7O8Y=
5454
file_glob: true
55-
file: install/opt/build_*_$QT_VER.tar.xz
55+
file: install/build_*_$QT_VER.tar.xz
5656
on:
5757
repo: Skycoder42/QtDataSync
5858
tags: true
5959

6060
before_cache:
6161
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
62-
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
63-
- rm -fr $QPMX_CACHE_DIR/locks
62+
- rm -rf $HOME/.gradle/caches/*/plugin-resolution/
63+
- rm -rf $QPMX_CACHE_DIR/locks
64+
- rm -rf $QPMX_CACHE_DIR/tmp
6465
cache:
6566
directories:
6667
- $HOME/.gradle/caches/

appveyor.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ image:
55
version: build-{build}
66

77
environment:
8-
QT_VER: 5.10.1
8+
QT_VER: 5.11.0
99
EXTRA_MODULES: .qtremoteobjects;.skycoder42.jsonserializer
10-
STATIC_QT_MODS: qttools qtwebsockets qtscxml qtremoteobjects
11-
STATIC_EXTRA_MODS: qtjsonserializer
1210

1311
matrix:
1412
- PLATFORM: msvc2017_64

deploy.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"description": "A simple offline-first synchronisation framework, to synchronize data of Qt applications between devices.",
44
"modules": [ "QtDataSync" ],
55
"dependencies": [
6+
".qtremoteobjects",
67
".skycoder42.jsonserializer"
78
],
89
"excludes": [ "static", "mingw", "winrt_arm" ],

src/3rdparty/cryptopp/appveyor.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
set version=6_0_0
3+
set version=7_0_0
44

55
echo %PLATFORM% | findstr /C:"winrt_x64" > nul && (
66
set pkgName=%PLATFORM:~10%_64

src/3rdparty/cryptopp/travis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
version=6_0_0
4+
version=7_0_0
55

66
case "$PLATFORM" in
77
gcc_64)

0 commit comments

Comments
 (0)