Changes for master

qwertycoin-org · Aug 22, 2019 · 30c6508 · 30c6508
1 parent a305417
commit 30c6508
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -11,11 +11,11 @@ environment:
         BOOST_LIBRARYDIR: "C:/Libraries/boost_1_70_0/lib64-msvc-14.1"
         Qt5_DIR: "C:/Qt/5.12/msvc2017_64/lib/cmake/Qt5"
     matrix:
-#        - Purpose: "WindowsDebugBuild"
-#          QWC_GENERATOR_NAME: "Visual Studio 15 2017 Win64"
-#          QWC_BUILD_TYPE: "Debug"
-#          QWC_TOOLCHAIN_FILE_NAME: "cmake/polly/vs-15-2017-win64.cmake"
-#          QWC_TESTS_REGEXP: "NONE"
+        - Purpose: "WindowsDebugBuild"
+          QWC_GENERATOR_NAME: "Visual Studio 15 2017 Win64"
+          QWC_BUILD_TYPE: "Debug"
+          QWC_TOOLCHAIN_FILE_NAME: "cmake/polly/vs-15-2017-win64.cmake"
+          QWC_TESTS_REGEXP: "NONE"
         - Purpose: "WindowsReleaseBuild"
           QWC_GENERATOR_NAME: "Visual Studio 15 2017 Win64"
           QWC_BUILD_TYPE: "Release"
@@ -46,10 +46,10 @@ deploy:
     description: "Qwertycoin GUI release"
     provider: GitHub
     auth_token:
-        secure: "4VgHg760VN6gCaRp6++fnkyxTe/p4vZ8DCNry0YDRhI6O4Pml9+29kfBv2WIjROA"
+        secure: "2+Ji3AkIi/6n3bNzeQNvr7ZKetnvNC/K5czk1iDU5OQHiozVan1ksMw3Nk1GTssO"
     artifact: /qwertycoin-gui-.*\.exe/
     draft: true
     prerelease: true
     on:
-        APPVEYOR_REPO_TAG: false
+        APPVEYOR_REPO_TAG: true
         QWC_BUILD_TYPE: "Release"
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,15 @@ language: cpp
 
 matrix:
     include:
-#        - name: "Linux, Debug"
-#          os: linux
-#          dist: xenial
-#          sudo: required
-#          env:
-#              - CMAKE_GENERATOR_NAME="Unix Makefiles"
-#              - CMAKE_BUILD_TYPE="Debug"
-#              - CMAKE_TOOLCHAIN_FILE_NAME=gcc-cxx14-c11.cmake
-#              - Qt5_DIR="/opt/qt512/lib/cmake/Qt5"
+        - name: "Linux, Debug"
+          os: linux
+          dist: xenial
+          sudo: required
+          env:
+              - CMAKE_GENERATOR_NAME="Unix Makefiles"
+              - CMAKE_BUILD_TYPE="Debug"
+              - CMAKE_TOOLCHAIN_FILE_NAME=gcc-cxx14-c11.cmake
+              - Qt5_DIR="/opt/qt512/lib/cmake/Qt5"
         - name: "Linux, Release"
           os: linux
           dist: xenial
@@ -20,14 +20,14 @@ matrix:
               - CMAKE_BUILD_TYPE="Release"
               - CMAKE_TOOLCHAIN_FILE_NAME=gcc-cxx14-c11.cmake
               - Qt5_DIR="/opt/qt512/lib/cmake/Qt5"
-#        - name: "macOS, Debug"
-#          os: osx
-#          osx_image: xcode10.2
-#          env:
-#              - CMAKE_GENERATOR_NAME="Unix Makefiles"
-#              - CMAKE_BUILD_TYPE="Debug"
-#              - CMAKE_TOOLCHAIN_FILE_NAME=clang-cxx14.cmake
-#              - Qt5_DIR="/usr/local/opt/qt/lib/cmake/Qt5"
+        - name: "macOS, Debug"
+          os: osx
+          osx_image: xcode10.2
+          env:
+              - CMAKE_GENERATOR_NAME="Unix Makefiles"
+              - CMAKE_BUILD_TYPE="Debug"
+              - CMAKE_TOOLCHAIN_FILE_NAME=clang-cxx14.cmake
+              - Qt5_DIR="/usr/local/opt/qt/lib/cmake/Qt5"
         - name: "macOS, Release"
           os: osx
           osx_image: xcode10.2
@@ -75,12 +75,12 @@ script:
 deploy:
     provider: releases # GitHub Releases
     api_key:
-        secure: "st8VQ60nphaWVJJqamvLp3aLxhaP3B9cEcL5g/6grQxZvSBingu07o849cMa1TcXk9moLXgJlxqI5TkOkIubQ+NRnjCVKdiA8om242BwBzoMtgrpNWxh66pHIhIUR1V61mVhkKFrVN4/z2UGV8syt6E7O1W/kbWeBJW13Z4IZDgZhxW1LnN/OKFsPu7+zYhfZ1cYLfpQSiVQovH1R3p2WkeNHv4ZaCd0+yV6Dm8SaQNjzLT/6j/xOmflTllSdzKa+2viVL0sBT07uuwzaL+6dNN6/EWI2q88WHL8z9EgkTOFgB58IfkOrcGFP6mM67k9uvqVf11Sykn28WuF7Q4YHZPVdFt9hYXS4WnKLEB7SoO7t9OH6xrlRoMmZr2lg4JYxE+25WpcFZ/RGGXR+owntWTaouanUcSS/ESm59iqkBZalEnsNX1GbHBiaxQLsJiG/ZO70XMA3wS88CtMXs8he9Rc5uGvLdyFJJU3Q3PewTizqkzny3NBXCoz/GkhiGf1g8MDjHUXh3CtM/mzdBj+4gbMaivSRH2PEo8BiqDe7h0pKSIcWZ8Np+LppbQuMHPzD2yumbQnV20iNfAMrlozuWgj20N5lqK8bglO+2jKoDaQBBctxjeXORiBHH9UaDrCvpSwdmEHRoK7qnQWi5bOxfce7EdatJ6CuQ/PQ1jqahw="
+        secure: "OOPZ+YOZRNOLjj/B9EQZqXiV+D+xM9Nc2bz2wSXP58TS0kc1N1XvrLH/bKPsV1KGziYAZvm/PDH1+xdyH/aW48jLxmCrzxwqhUoL+rwYhSZVXsV5JLWeJuC6TtdrJUIGen7E3K8lTht5GicLaQdPtEN+wZgIjFDOBFUJiip0hAe867U8M3Tmpy+azBP6uRTijHGCxaFGnf93bLPeGzSaNk2nVzoA8xsALeEj0BUum9vRuzPGvQJeQqTrPYWWG9qaNmY6pDyrX1o7xS2Fxk0Rljglv4tw/feTe9r4PJvX429gnpd87PoV07aLauxkgwA0PmOguco7syHCZI2IAR9w35lZIlwhFngjQGCZlzPjNtckyCQxIR8PULDNbx5wPUnvQjM0Y+79G7qiz1ueJfiv0GSk4M0S/fcaRH6X5qJlZu4eHzCNCqc86rjeykAdWmCv6Rm7dHnKMlBMZEFhlyGESynFhFLwk0eExONTlQ7Db9Ol9/eXz3kKIbzOHnnr3bltlRU086gCr8e5zy4021T0QIBORuPJiyoZYGppRiF3aEGlB+8fRE05evAvHRt4KXcNodbkdOxAZ/mmZjPw28G0vUtftFxWXpt9XPsGnkhZryAqCnsGbcBACOEdjEHEhqV95DXRi7mL/liqbRx6ZnDVKQNQRzyFdGi28it6ihffB/w="
     file: dist/qwertycoin-gui-* # path is relative to the current working directory, not to $TRAVIS_BUILD_DIR
     file_glob: true
     draft: true
     on:
         branch: master
-        tags: false
+        tags: true
         condition: $CMAKE_BUILD_TYPE = "Release"
     skip_cleanup: true
diff --git a/src/qwertycoinwallet.desktop b/src/qwertycoinwallet.desktop
@@ -21,4 +21,4 @@ Type=Application
 Icon=qwertycoin
 MimeType=x-scheme-handler/qwertycoin;
 Categories=Office;Finance;
-Version=5.2.1
+Version=5.2.2