update ci

Author: Skycoder42

.travis.yml

@@ -9,11 +9,12 @@ osx_image: xcode10.1
 
 env:
   global:
-    - QPMX_CACHE_DIR=$HOME/.qpmx-cache
-    - QT_VER=5.12.0
-    - EXTRA_MODULES=".skycoder42.datasync"
+    - QDEP_CACHE_DIR=$HOME/.qdep-cache
+    - QT_VER=5.12.1
     - DOCKER_IMAGE=datasync
-    - MAKE_RUN_TESTS=true #experimental
+    - EXTRA_MODULES=".skycoder42.datasync"
+    - MAKE_RUN_TESTS=true
+    - TARGET_NAME=qtmvvm
 
 matrix:
   include:
@@ -53,19 +54,17 @@ deploy:
   api_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/build_*_$QT_VER.tar.xz
+  file: install/${TARGET_NAME}_*_$QT_VER.tar.xz
   on:
     repo: Skycoder42/QtMvvm
     tags: true
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  - rm -fr $QPMX_CACHE_DIR/locks
-  - rm -rf $QPMX_CACHE_DIR/tmp
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
     - $HOME/.android/build-cache
-    - $QPMX_CACHE_DIR
+    - $QDEP_CACHE_DIR

appveyor.yml

@@ -5,9 +5,10 @@ image:
 version: build-{build}
 
 environment:
-  QT_VER: 5.12.0
+  QT_VER: 5.12.1
   EXTRA_MODULES: .skycoder42.datasync
-  MAKE_RUN_TESTS: true #experimental
+  MAKE_RUN_TESTS: true
+  TARGET_NAME: qtmvvm
 
   matrix:
     - PLATFORM: msvc2017_64
@@ -46,7 +47,7 @@ after_build:
   - .\qtmodules-travis\ci\win\upload-prepare.bat
 
 artifacts:
-  - path: install\build_*_%QT_VER%.zip
+  - path: install\%TARGET_NAME%_*_%QT_VER%.zip
 
 deploy:
   provider: GitHub
@@ -58,4 +59,4 @@ deploy:
     appveyor_repo_tag: true
 
 cache:
-  - 'C:\Users\appveyor\AppData\Local\Skycoder42\qpmx\cache -> appveyor.yml'
+  - 'C:\Users\appveyor\AppData\Local\qdep\qdep\Cache -> appveyor.yml'