From 68b19c50b6ea735f4d81af64a7eeda145af94fda Mon Sep 17 00:00:00 2001
From: Salvo Virga <salvo.virga@tum.de>
Date: Tue, 18 Jun 2019 12:04:25 +0200
Subject: [PATCH] Fix for CPack Artifacts (#62)

* [CI] - fixing Travis token for release artifacts upload

* [CI] - fixing release artifacts generation via appveyor

* [CI] - fixing release artifacts generation via appveyor

* [CI] - avoiding cleanup on deploy for Travis

* [CI] - fixing appveyor yaml

* [CI] - more fixing on appveyor ylm

* [CI] - playing with appveyor yml

* [CI] - playing with appveyor yml

* [CI] - playing with appveyor yml

* [CI] - fixing appveyor yml indentation

* [CI] - fixing appveyor

* [CI] - fixing travis deployment

* [CI] - fixing finding the artifact file on travis

* [CI] - fixing travis token

* [CI] - Travis skip cleanup after CPack

* [CI] - removed unused param from cmake call in appveyor

* [CI] - fixing travis script

* [CI] - addding appveyor artifact

* [CI] - fixing appveyor artifact path

* [CI] - fixing appveyor artifact path

has to be relative to the project path, not absolute
---
 .travis.yml  | 31 ++++++++++++-------------------
 appveyor.yml | 29 ++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 29f40bd..dc53ad7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,29 +156,22 @@ script:
     ctest -R simple_tests -C Release --output-on-failure   
   fi
 
-after_success:
+before_deploy:
+- cpack
 - |
-  if [[ "${SIMPLE_PACKAGE}" == "True" ]]; then
-    cpack
+  if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+    export RELEASE_PKG_FILE=$(ls *.deb)
+  else
+    export RELEASE_PKG_FILE=$(ls *.tar.gz) 
   fi
+- echo "deploying $RELEASE_PKG_FILE to GitHub releases"
 
 deploy:
+  skip_cleanup: true
   provider: releases
   api_key:
-    secure: FLrIYC+3igsKRGMouvhY57l+iTavMUdYDCgWhEYG2Lld50I4Mouuel4dEXJwRSFPkcaSSJx19YGxx/0s59vRdqril/q+bPYTRYfDXVcDTDdSVolOV0iSAEImsQ+QAxRSm1/+Ubxb/jG3LvFOBQ7cByTmmfyT4U3RjRO8LNKzkmPRUZJFE491RzoB/MMIZGHUZ6nl3O1teoVVkvVPxgPsws1jtHkZUWPAJmAk3Nwg+OvWoC9Vop8zSonzaBriXw38kjw1qV/vAic7PvY6UOAuEzs7hLCdBPCBMxzu0ImLrP4v2ZVSMhHrqdeII40fHo6KDDEDX1Isy5oFX+cGRNE878zy9qbfyIMDwTHdp0YBOazg/pPkCxJh34nPji3JgpJZFsJ8tM7weiNdfN2HpXVaDXrmhNndov/dmRAGNG85xXchJr5G6Pth/EZVaN9DO3SbtOuafATwqkWLK4qeWhp0Gm/Kji05/R7tngp25lsdTq7+Oic1U+Ohn0kFv2SPyEh/nv9Ju54a4BvjJx9P3ORqzPnEwWNpuE22y26F5dWQmVLThDa2oML3MzfoSFGp8GxfSFmyiuVCqDWm3P+QI3ClpeX2UvBwl1Xv22fO97raZyT/aGW3M3wFCANmENobhPv/ZvQLDcg0w2bEZEkkZiRuZ4XQKIV3C6jEhyV50ZPa258=
-  file: "*.deb"
+    secure: JK+I7hl4CC7r2FszwagkswyjX8TeIbVXdjvG1FK8z/aeKpW2GYF6648neJuwMqIhlIlEtomUBOdLz+SXmPKIa2xTlFPvn388B2MBM/ZkJffeYs0rj4pictz1EDcZ7lgB7E8THB1bCGrICe3Jq1CoLhuWwZ91V3WgQrStCgQP9NY7JRP2uOKmGPpFf+drDQrKGuBYUak2ihoCyxTi/0BZL1I1yA46820U7fK3NaMIKPL2XnfVRJ+z01FY6riiGDxeitcrdB3tEOFIUjgM1lqTYbJ8X32N3l11kSHlogDPvbfbhwcP9CuoMEEycv8unWPWMdqucCM3XMD6R1Z28RXOwENNBGsmQQiJHDnRj+0oLqiHt5kKX0F/JMuBtZz/0WR2d9SWoAjj9dsYML+q5pAV5ESOTlQavcHq9aWJP/nSTzZYdp2zCDGJO48DyT6Z6ihrmgRWSzBSK/5jzuRLaJB3s4S6bpvkTY+CjLu7pP3xvnbHXMH5JQxU6yjf2KivjZ7DXZt0t2O+v3D/rwkGJ3ATU6iGjTxzQbVMhURlz7fWIjsFZATDbgizcHYJHwkVmKLzZmKEb6J0cLOdgGn23eGTjWEb0tL84eu+EcOTLBGhXtvhRtWyevehndEsnhJOyo+0Xm47CU5U6NDesVMXeoZi0Ts+zYflx85q7fvGB7R3amQ=
+  file_glob: true
+  file: "${RELEASE_PKG_FILE}"
   on:
-    repo: IFL-CAMP/simple
-    tags: true
-    os: linux
-
-deploy:
-  provider: releases
-  api_key:
-    secure: FLrIYC+3igsKRGMouvhY57l+iTavMUdYDCgWhEYG2Lld50I4Mouuel4dEXJwRSFPkcaSSJx19YGxx/0s59vRdqril/q+bPYTRYfDXVcDTDdSVolOV0iSAEImsQ+QAxRSm1/+Ubxb/jG3LvFOBQ7cByTmmfyT4U3RjRO8LNKzkmPRUZJFE491RzoB/MMIZGHUZ6nl3O1teoVVkvVPxgPsws1jtHkZUWPAJmAk3Nwg+OvWoC9Vop8zSonzaBriXw38kjw1qV/vAic7PvY6UOAuEzs7hLCdBPCBMxzu0ImLrP4v2ZVSMhHrqdeII40fHo6KDDEDX1Isy5oFX+cGRNE878zy9qbfyIMDwTHdp0YBOazg/pPkCxJh34nPji3JgpJZFsJ8tM7weiNdfN2HpXVaDXrmhNndov/dmRAGNG85xXchJr5G6Pth/EZVaN9DO3SbtOuafATwqkWLK4qeWhp0Gm/Kji05/R7tngp25lsdTq7+Oic1U+Ohn0kFv2SPyEh/nv9Ju54a4BvjJx9P3ORqzPnEwWNpuE22y26F5dWQmVLThDa2oML3MzfoSFGp8GxfSFmyiuVCqDWm3P+QI3ClpeX2UvBwl1Xv22fO97raZyT/aGW3M3wFCANmENobhPv/ZvQLDcg0w2bEZEkkZiRuZ4XQKIV3C6jEhyV50ZPa258=
-  file: "*.tar.gz"
-  on:
-    repo: IFL-CAMP/simple
-    tags: true
-    os: osx
-
+    tags: true
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 1311e77..8e9f5fd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,8 +4,6 @@ version: "{build}"
 os:
   - Visual Studio 2017
 
-skip_tags: true
-
 configuration:
   - Release
 
@@ -44,22 +42,39 @@ before_build:
   - cd %APPVEYOR_BUILD_FOLDER%
   - rmdir deps /s /q
   - mkdir build && cd build
-  - cmake -G "%CMAKE_GENERATOR% Win64" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DSIMPLE_BUILD_TESTS=ON -DSIMPLE_BUILD_EXAMPLES=ON ..
+  - ps: >-
+      If ($env:APPVEYOR_REPO_TAG -eq "false") {
+        cmake -G "$env:CMAKE_GENERATOR Win64" -DSIMPLE_BUILD_TESTS=ON -DSIMPLE_BUILD_EXAMPLES=ON ..
+      } Else {
+        cmake -G "$env:CMAKE_GENERATOR Win64" -DSIMPLE_BUILD_STATIC=OFF -DSIMPLE_ENABLE_CPACK=ON ..
+      }
 
 build_script:
   - cmake --build . --config %CONFIGURATION% -- /verbosity:minimal
 
 test_script:
-  - ctest -R simple_tests -C %CONFIGURATION% --output-on-failure
+  - ps: >-
+      If ($env:APPVEYOR_REPO_TAG -eq "false") { 
+        ctest -R simple_tests -C $env:CONFIGURATION --output-on-failure
+      }
+
+after_build:
+  - ps: >-
+      If ($env:APPVEYOR_REPO_TAG -eq "true") { 
+        cpack
+      }
+
+artifacts:
+- path: 'build/*.exe'
+  name: simple_artifact
 
 deploy:
   description: 'S.I.M.P.L.E. Release'
   provider: GitHub
   auth_token:
-    secure: cUPtOPIdMqFQI0T2jkc4PZVdafqiSRTHYxG0b0ajBQZ2ySvhjeq1r4SQu1BR/p7y
-  artifact: /.*\.exe/
+    secure: /Zfum05XMUCPaLKLsrsOTr/t4A8Kvz3lDN4ajPt6SZRlU+AX1/ee0CqpgR5AKCGg
+  artifact: simple_artifact
   draft: false
   prerelease: false
   on:
-    branch: master
     APPVEYOR_REPO_TAG: true