From 4f2711f15b470e5d3d42fbec54e737d21376d79d Mon Sep 17 00:00:00 2001
From: sas <davidsastresas@gmail.com>
Date: Mon, 28 Oct 2019 06:16:12 +0100
Subject: [PATCH] ci test

---
 .appveyor.yml | 51 ++--------------------------------------------
 .travis.yml   | 56 ++++-----------------------------------------------
 2 files changed, 6 insertions(+), 101 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f11b89f7c8c..541d5467536 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -102,59 +102,12 @@ deploy:
 #    on:
 #      CONFIG: installer
 #      appveyor_repo_tag: true
-
-# deploy tagged releases to Github releases
   - provider: GitHub
     auth_token:
-      secure: dzWLqd0eTKjrAWC5LgqVnwLemmrNdddGA2ZZn/OthAP37mwCLkP2C1zil7ivmEE8
+      secure: aMjI+3nOeghYklKPpCalxIXJNQmD3iQm3t0v0SPEWLkIKpa4Oux4+kgDayaofaMe
     artifact: qgcinstaller
     draft: false
     prerelease: false
     on:
       CONFIG: installer
-      appveyor_repo_tag: true
-
-# deploy tagged releases to s3 version folder
-  - provider: S3
-    access_key_id:
-      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
-    secret_access_key:
-      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
-    bucket: qgroundcontrol
-    region: us-west-2
-    set_public: true
-    folder: $(APPVEYOR_REPO_TAG_NAME)
-    artifact: qgcinstaller
-    on:
-      CONFIG: installer
-      appveyor_repo_tag: true
-
-# deploy tagged releases to s3 latest folder
-  - provider: S3
-    access_key_id:
-      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
-    secret_access_key:
-      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
-    bucket: qgroundcontrol
-    region: us-west-2
-    set_public: true
-    folder: latest
-    artifact: qgcinstaller
-    on:
-      CONFIG: installer
-      appveyor_repo_tag: true
-
-# deploy pdb for tagged releases to s3 latest folder
-  - provider: S3
-    access_key_id:
-        secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
-    secret_access_key:
-        secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
-    bucket: qgroundcontrol
-    region: us-west-2
-    set_public: true
-    folder: latest
-    artifact: pdb
-    on:
-       CONFIG: installer
-       appveyor_repo_tag: true
+      appveyor_repo_tag: false
diff --git a/.travis.yml b/.travis.yml
index 7f290e56d43..65fb74fe56a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -222,64 +222,16 @@ before_deploy:
     fi
 
 deploy:
-  # deploy installers to s3 builds/ if on a branch
-  - provider: s3
-    access_key_id: AKIAIVORNALE7NHD3T6Q
-    secret_access_key:
-      secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
-    bucket: qgroundcontrol
-    local_dir: ${SHADOW_BUILD_DIR}/release/package
-    upload-dir: builds/${TRAVIS_BRANCH}
-    acl: public_read
-    region: us-west-2
-    skip_cleanup: true
-    on:
-      all_branches: true
-      condition: $CONFIG = installer
-
-  # deploy tagged installers to s3 latest/
-  - provider: s3
-    access_key_id: AKIAIVORNALE7NHD3T6Q
-    secret_access_key:
-      secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
-    bucket: qgroundcontrol
-    local_dir: ${SHADOW_BUILD_DIR}/release/package
-    upload-dir: latest
-    acl: public_read
-    region: us-west-2
-    skip_cleanup: true
-    on:
-      tags: true
-      condition: $CONFIG = installer
-
-  # deploy tagged installers to s3 version folder
-  - provider: s3
-    access_key_id: AKIAIVORNALE7NHD3T6Q
-    secret_access_key:
-      secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
-    bucket: qgroundcontrol
-    local_dir: ${SHADOW_BUILD_DIR}/release/package
-    upload-dir: ${TRAVIS_BRANCH}
-    acl: public_read
-    region: us-west-2
-    skip_cleanup: true
-    on:
-      tags: true
-      condition: $CONFIG = installer
-
-  # deploy installers to Github releases if on a tag
   - provider: releases
-    api-key:
-      secure: K/Zqr/FCC7QvzFxYvBtCinPkacQq2ubJ2qm982+38Zf/KjibVOF1dEbVdrGZmII6Tg5DaQzNXGYkg5PvYmJgT9xRsqeQjeYIUYqYZpAt+HYWA38AVfMU8jip/1P1wmwqD469nzJOBBa8yfsMs6Ca7tBaNl/zTxCRGnAgEzqtkdQ=
+    api_key: $GITHUB_TOKEN
     file_glob: true
-    file:
+    file: 
       - ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.*
       - ${SHADOW_BUILD_DIR}/release/package/QGroundControl.*
     skip_cleanup: true
     on:
-      tags: true
-      condition: $CONFIG = installer
-
+      all_branches: true
+      
 notifications:
   webhooks:
     urls: