From cf040af06b284a165989dd41ac6a9461660e02b4 Mon Sep 17 00:00:00 2001
From: Doug Morato <dm@corp.io>
Date: Thu, 20 Aug 2015 21:33:58 -0400
Subject: [PATCH] Move artifacts to folder, then deploy folder to S3

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d29895c9f..c706cead2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,12 @@ before_deploy:
   - export WEBGOAT_ARTIFACT_VERSION=$(grep "<version>" $HOME/build/$TRAVIS_REPO_SLUG/pom.xml | cut -d ">" -f 2 | cut -d "<" -f 1)
   - export WEBGOAT_JAR_FILE=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-container/target/webgoat-container-$WEBGOAT_ARTIFACT_VERSION-war-exec.jar
   - export WEBGOAT_WAR_FILE=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-container/target/webgoat-container-$WEBGOAT_ARTIFACT_VERSION.war
-  - echo "Webgoat JAR file $WEBGOAT_JAR_FILE"
-  - echo "Webgoat WAR file $WEBGOAT_WAR_FILE"
+  - export WEBGOAT_ARTIFACTS_FOLDER=$HOME/build/$TRAVIS_REPO_SLUG/Deployable_Artifacts/
+  - mkdir $WEBGOAT_ARTIFACTS_FOLDER
+  - mv $WEBGOAT_JAR_FILE $WEBGOAT_ARTIFACTS_FOLDER
+  - mv $WEBGOAT_WAR_FILE $WEBGOAT_ARTIFACTS_FOLDER
+  - echo "Contents of artifcts folder:"
+  - ls $WEBGOAT_ARTIFACTS_FOLDER
 
 deploy:
   provider: s3
@@ -24,10 +28,7 @@ deploy:
   bucket: "webgoat-war"
   skip_cleanup: true
   acl: public_read
-  file_glob: true
-  file:
-    - $WEBGOAT_JAR_FILE
-    - $WEBGOAT_WAR_FILE
+  local_dir: $WEBGOAT_ARTIFACTS_FOLDER
   on:
     repo: dougmorato/WebGoat
     branch: docs