From d91986c31ab6e5d58c07d6fc3dcc194a2b3c553b Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Thu, 8 Feb 2018 21:56:43 +0100 Subject: [PATCH] fixup initial ci --- .travis.yml | 58 ++++++++----------- appveyor.yml | 53 ++++++++--------- qtmvvm.pro | 4 +- src/mvvmcore/mvvmcore.pro | 1 + src/mvvmcore/translations/qtmvvmcore_de.ts | 4 ++ .../translations/qtmvvmcore_template.ts | 4 ++ src/mvvmquick/mvvmquick.pro | 1 + src/mvvmquick/translations/qtmvvmquick_de.ts | 4 ++ .../translations/qtmvvmquick_template.ts | 4 ++ src/mvvmwidgets/mvvmwidgets.pro | 1 + .../translations/qtmvvmwidgets_de.ts | 4 ++ .../translations/qtmvvmwidgets_template.ts | 4 ++ 12 files changed, 80 insertions(+), 62 deletions(-) create mode 100644 src/mvvmcore/translations/qtmvvmcore_de.ts create mode 100644 src/mvvmcore/translations/qtmvvmcore_template.ts create mode 100644 src/mvvmquick/translations/qtmvvmquick_de.ts create mode 100644 src/mvvmquick/translations/qtmvvmquick_template.ts create mode 100644 src/mvvmwidgets/translations/qtmvvmwidgets_de.ts create mode 100644 src/mvvmwidgets/translations/qtmvvmwidgets_template.ts diff --git a/.travis.yml b/.travis.yml index cb9e07a..91a4f38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,35 +9,27 @@ osx_image: xcode9.2 env: global: - - QPMX_CACHE_DIR=$HOME/.qpmx-cache - - QT_VER=5.10.0 - - EXTRA_MODULES=.skycoder42 + - QPMX_CACHE_DIR=$HOME/.qpmx-cache + - QT_VER=5.10.0 matrix: include: - - os: linux - env: - - PLATFORM=gcc_64 - - BUILD_DOC=true - - os: linux - env: - - PLATFORM=android_armv7 - - os: linux - env: - - PLATFORM=android_x86 - - os: osx - env: - - PLATFORM=clang_64 - - os: osx - env: - - PLATFORM=ios - # only when using static tools - - os: linux - env: - - PLATFORM=static - - os: osx - env: - - PLATFORM=static + - os: linux + env: + - PLATFORM=gcc_64 + - BUILD_DOC=true + - os: linux + env: + - PLATFORM=android_armv7 + - os: linux + env: + - PLATFORM=android_x86 + - os: osx + env: + - PLATFORM=clang_64 + - os: osx + env: + - PLATFORM=ios before_install: - git clone https://github.com/Skycoder42/QtModules.git ./qtmodules-travis @@ -52,12 +44,12 @@ deploy: provider: releases skip_cleanup: true api_key: - secure: + secure: DNJ5j4HmaEKSrFk+4+hMBAiM4eEJJrfvrSPgY37S1rVByFmtfpAF3ZDb0UuJpD7PEWP5cOOOwg5t7pjh3FBREQYgSxmigmJuBH7Y660+NJ+yn+iZyQJO6aNl4wLhzLBKFq7vgWTaoovM7URVYfBrY++NvoIpHWsd+rxohNcF/xiFTbKtwa9qh82SGtAdnrvYGaQ/Je8q7i9Uhh9vE4hnDauzGSrMCpr5mzbyvtYTKTfzEadty2wTXETboCd6dDg6GLFvxwxeNxe4/gg4kRVEPk/pAU1skNwsfjInBS2EqlWvOqoHggkl726+3E4QcHlL0AkkTpEafPb2zDUKsV8YlnFs3ckL1/c6+ict7iX5tt4woug940CvzU7cTOXTvinZPoFmFDv9d46CU5vYEuXUy4ExQCxHDeimk0VwICxJNxkYS+CNCSrGAMkwHZV3V6SUcoPuha4zz7mKpP0IGOmQhG/ZBtRNryh7tyI/dqhMu6j5RhqoBIPkVJdbgHC5tXgLfAmQOeE+jXLeYXV0oVine2Oof7E4WNVvS1if2HXUxB5S8wNnS3qQ7tNHtxk0gHRa5YvBOyV80ApVhmf/3cO/AXvBMT0rR3FhOso+drd8RiTLgYn5qNV9t0Bq9ykm1GAIAwIJVieyV69b43qqOfhuUA9v1y7dpzn7HYjUYUWCo90= file_glob: true file: install/opt/build_*_$QT_VER.tar.xz on: - repo: - tags: true + repo: + tags: true before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock @@ -65,7 +57,7 @@ before_cache: - rm -fr $QPMX_CACHE_DIR/locks cache: directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ - - $HOME/.android/build-cache - - $QPMX_CACHE_DIR + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + - $HOME/.android/build-cache + - $QPMX_CACHE_DIR diff --git a/appveyor.yml b/appveyor.yml index 4f3f480..761a7d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,37 +6,34 @@ version: build-{build} environment: QT_VER: 5.10.0 - EXTRA_MODULES: .skycoder42 matrix: - - PLATFORM: msvc2017_64 - - PLATFORM: winrt_x64_msvc2017 - - PLATFORM: winrt_x86_msvc2017 - - PLATFORM: winrt_armv7_msvc2017 - - PLATFORM: msvc2015_64 - - PLATFORM: msvc2015 - - PLATFORM: mingw53_32 - # only when using static tools - - PLATFORM: static + - PLATFORM: msvc2017_64 + - PLATFORM: winrt_x64_msvc2017 + - PLATFORM: winrt_x86_msvc2017 + - PLATFORM: winrt_armv7_msvc2017 + - PLATFORM: msvc2015_64 + - PLATFORM: msvc2015 + - PLATFORM: mingw53_32 matrix: exclude: - - PLATFORM: msvc2017_64 - image: Visual Studio 2015 - - PLATFORM: winrt_x64_msvc2017 - image: Visual Studio 2015 - - PLATFORM: winrt_x86_msvc2017 - image: Visual Studio 2015 - - PLATFORM: winrt_armv7_msvc2017 - image: Visual Studio 2015 - - PLATFORM: msvc2015_64 - image: Visual Studio 2017 - - PLATFORM: msvc2015 - image: Visual Studio 2017 - - PLATFORM: mingw53_32 - image: Visual Studio 2017 - - PLATFORM: static - image: Visual Studio 2015 + - PLATFORM: msvc2017_64 + image: Visual Studio 2015 + - PLATFORM: winrt_x64_msvc2017 + image: Visual Studio 2015 + - PLATFORM: winrt_x86_msvc2017 + image: Visual Studio 2015 + - PLATFORM: winrt_armv7_msvc2017 + image: Visual Studio 2015 + - PLATFORM: msvc2015_64 + image: Visual Studio 2017 + - PLATFORM: msvc2015 + image: Visual Studio 2017 + - PLATFORM: mingw53_32 + image: Visual Studio 2017 + - PLATFORM: static + image: Visual Studio 2015 install: - git clone https://github.com/Skycoder42/QtModules.git .qtmodules-travis @@ -54,11 +51,11 @@ artifacts: deploy: provider: GitHub auth_token: - secure: + secure: Cp5GRQku2ZWnKPE12NB5q11ZO0Fr5mlzdUTjnLpYJr/dki4LPVqm231edFggogy8 artifact: /.*.zip/ force_update: false on: - appveyor_repo_tag: true + appveyor_repo_tag: true cache: - 'C:UsersappveyorAppDataLocalSkycoder42qpmxcache -> appveyor.yml' diff --git a/qtmvvm.pro b/qtmvvm.pro index 13589e3..664f0ca 100644 --- a/qtmvvm.pro +++ b/qtmvvm.pro @@ -15,4 +15,6 @@ lrelease.recurse += sub_src QMAKE_EXTRA_TARGETS += lrelease DISTFILES += .qmake.conf \ - sync.profile + sync.profile \ + .travis.yml \ + appveyor.yml diff --git a/src/mvvmcore/mvvmcore.pro b/src/mvvmcore/mvvmcore.pro index e52c854..84a843d 100644 --- a/src/mvvmcore/mvvmcore.pro +++ b/src/mvvmcore/mvvmcore.pro @@ -8,6 +8,7 @@ HEADERS += \ SOURCES += TRANSLATIONS += \ + translations/qtmvvmcore_de.ts \ translations/qtmvvmcore_template.ts DISTFILES += $$TRANSLATIONS diff --git a/src/mvvmcore/translations/qtmvvmcore_de.ts b/src/mvvmcore/translations/qtmvvmcore_de.ts new file mode 100644 index 0000000..1552582 --- /dev/null +++ b/src/mvvmcore/translations/qtmvvmcore_de.ts @@ -0,0 +1,4 @@ + + + + diff --git a/src/mvvmcore/translations/qtmvvmcore_template.ts b/src/mvvmcore/translations/qtmvvmcore_template.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/mvvmcore/translations/qtmvvmcore_template.ts @@ -0,0 +1,4 @@ + + + + diff --git a/src/mvvmquick/mvvmquick.pro b/src/mvvmquick/mvvmquick.pro index 550e617..56d88c6 100644 --- a/src/mvvmquick/mvvmquick.pro +++ b/src/mvvmquick/mvvmquick.pro @@ -8,6 +8,7 @@ HEADERS += \ SOURCES += TRANSLATIONS += \ + translations/qtmvvmquick_de.ts \ translations/qtmvvmquick_template.ts DISTFILES += $$TRANSLATIONS diff --git a/src/mvvmquick/translations/qtmvvmquick_de.ts b/src/mvvmquick/translations/qtmvvmquick_de.ts new file mode 100644 index 0000000..1552582 --- /dev/null +++ b/src/mvvmquick/translations/qtmvvmquick_de.ts @@ -0,0 +1,4 @@ + + + + diff --git a/src/mvvmquick/translations/qtmvvmquick_template.ts b/src/mvvmquick/translations/qtmvvmquick_template.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/mvvmquick/translations/qtmvvmquick_template.ts @@ -0,0 +1,4 @@ + + + + diff --git a/src/mvvmwidgets/mvvmwidgets.pro b/src/mvvmwidgets/mvvmwidgets.pro index d87e480..f74f368 100644 --- a/src/mvvmwidgets/mvvmwidgets.pro +++ b/src/mvvmwidgets/mvvmwidgets.pro @@ -8,6 +8,7 @@ HEADERS += \ SOURCES += TRANSLATIONS += \ + translations/qtmvvmwidgets_de.ts \ translations/qtmvvmwidgets_template.ts DISTFILES += $$TRANSLATIONS diff --git a/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts b/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts new file mode 100644 index 0000000..1552582 --- /dev/null +++ b/src/mvvmwidgets/translations/qtmvvmwidgets_de.ts @@ -0,0 +1,4 @@ + + + + diff --git a/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts b/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/mvvmwidgets/translations/qtmvvmwidgets_template.ts @@ -0,0 +1,4 @@ + + + +