Browse Source

fixup initial ci

pull/2/head
Skycoder42 7 years ago
parent
commit
d91986c31a
  1. 58
      .travis.yml
  2. 53
      appveyor.yml
  3. 4
      qtmvvm.pro
  4. 1
      src/mvvmcore/mvvmcore.pro
  5. 4
      src/mvvmcore/translations/qtmvvmcore_de.ts
  6. 4
      src/mvvmcore/translations/qtmvvmcore_template.ts
  7. 1
      src/mvvmquick/mvvmquick.pro
  8. 4
      src/mvvmquick/translations/qtmvvmquick_de.ts
  9. 4
      src/mvvmquick/translations/qtmvvmquick_template.ts
  10. 1
      src/mvvmwidgets/mvvmwidgets.pro
  11. 4
      src/mvvmwidgets/translations/qtmvvmwidgets_de.ts
  12. 4
      src/mvvmwidgets/translations/qtmvvmwidgets_template.ts

58
.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: <travis encrypted key>
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: <user/repository>
tags: true
repo: <user/repository>
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

53
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: <your encrypted token>
secure: Cp5GRQku2ZWnKPE12NB5q11ZO0Fr5mlzdUTjnLpYJr/dki4LPVqm231edFggogy8
artifact: /.*.zip/
force_update: false
on:
appveyor_repo_tag: true
appveyor_repo_tag: true
cache:
- 'C:UsersappveyorAppDataLocalSkycoder42qpmxcache -> appveyor.yml'

4
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

1
src/mvvmcore/mvvmcore.pro

@ -8,6 +8,7 @@ HEADERS += \
SOURCES +=
TRANSLATIONS += \
translations/qtmvvmcore_de.ts \
translations/qtmvvmcore_template.ts
DISTFILES += $$TRANSLATIONS

4
src/mvvmcore/translations/qtmvvmcore_de.ts

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
</TS>

4
src/mvvmcore/translations/qtmvvmcore_template.ts

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
</TS>

1
src/mvvmquick/mvvmquick.pro

@ -8,6 +8,7 @@ HEADERS += \
SOURCES +=
TRANSLATIONS += \
translations/qtmvvmquick_de.ts \
translations/qtmvvmquick_template.ts
DISTFILES += $$TRANSLATIONS

4
src/mvvmquick/translations/qtmvvmquick_de.ts

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
</TS>

4
src/mvvmquick/translations/qtmvvmquick_template.ts

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
</TS>

1
src/mvvmwidgets/mvvmwidgets.pro

@ -8,6 +8,7 @@ HEADERS += \
SOURCES +=
TRANSLATIONS += \
translations/qtmvvmwidgets_de.ts \
translations/qtmvvmwidgets_template.ts
DISTFILES += $$TRANSLATIONS

4
src/mvvmwidgets/translations/qtmvvmwidgets_de.ts

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
</TS>

4
src/mvvmwidgets/translations/qtmvvmwidgets_template.ts

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
</TS>
Loading…
Cancel
Save