From 2d7be87fb6aba8bf1d0607bcbde15a0705f56809 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Thu, 3 Sep 2020 20:52:16 +0100
Subject: [PATCH] Improve deployment of distro binary.

---
 .travis.yml   | 16 ++++++++++------
 bin/deploy.sh |  5 +++++
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 bin/deploy.sh

diff --git a/.travis.yml b/.travis.yml
index 55ac215c..6825b180 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,19 @@ sudo: required
 language: java
 services:
   - docker
-  - mongo
 install: true
 script:
   - docker build --tag=sdkman/sdkman-cli .
-  - docker run --rm -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli clean test -Dscan --info
-after_success:
-  - docker run --rm -e BINTRAY_USERNAME=$BINTRAY_USERNAME -e BINTRAY_API_KEY=$BINTRAY_API_KEY -e TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli -Penv=production clean assemble bintrayUpload
-  - bin/dopublish nyc3.digitaloceanspaces.com sdkman "dist/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip" "build/distributions/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip"
-  - bin/release-binary.sh $TRAVIS_BRANCH $TRAVIS_BUILD_NUMBER $MONGO_URL $MONGO_USERNAME $MONGO_PASSWORD
+  - docker run --rm -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli clean test --info
+deploy: 
+    - provider: script
+      script: bin/deploy.sh
+      on:
+          branch: master
+    - provider: script
+      script: bin/deploy.sh
+      on:
+          tags: true
 before_cache:
   - sudo rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:
diff --git a/bin/deploy.sh b/bin/deploy.sh
new file mode 100644
index 00000000..14fb55fe
--- /dev/null
+++ b/bin/deploy.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+docker run --rm -e BINTRAY_USERNAME=$BINTRAY_USERNAME -e BINTRAY_API_KEY=$BINTRAY_API_KEY -e TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli -Penv=production clean assemble bintrayUpload
+bin/dopublish nyc3.digitaloceanspaces.com sdkman "dist/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip" "build/distributions/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip"
+bin/release-binary.sh $TRAVIS_BRANCH $TRAVIS_BUILD_NUMBER $MONGO_URL $MONGO_USERNAME $MONGO_PASSWORD