Fix s3 sync for windows, add build for master branch

fritzing · Jul 3, 2019 · 872b5cd · 872b5cd
1 parent 86558c2
commit 872b5cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -126,6 +126,9 @@ jobs:
           - tools/build-windows.bat "$TRAVIS_COMMIT"-debug-continuous-"$TRAVIS_BUILD_NUMBER"
           - cp $TRAVIS_BUILD_DIR/../release64/fritzing-$TRAVIS_COMMIT-debug-continuous-$TRAVIS_BUILD_NUMBER.64.pc.zip ~/$TRAVIS_BUILD_NUMBER
 
+      after_success:
+        - ./tools/aws_tasks.sh synchronize_up
+
     - stage: deploy_to_github
       before_install:
         - mkdir -p "$HOME/$TRAVIS_BUILD_NUMBER"

diff --git a/tools/aws_tasks.sh b/tools/aws_tasks.sh
@@ -58,7 +58,7 @@ aws_secret_access_key = ${AWS_SECRET_ACCESS_KEY}
 EOL
 }
 
-if [[ ( "$TRAVIS_PULL_REQUEST" == false ) && ( "$TRAVIS_BRANCH" == "develop" ) && ( "$TRAVIS_REPO_SLUG" == "fritzing/fritzing-app" )]]; then
+if [[ ( "$TRAVIS_PULL_REQUEST" == false ) && ( "$TRAVIS_BRANCH" == "develop" || "$TRAVIS_BRANCH" == "master" ) && ( "$TRAVIS_REPO_SLUG" == "fritzing/fritzing-app" )]]; then
     x_aws_env
 
     echo "Running deploy task '$1' on $TRAVIS_OS_NAME ( $OSTYPE )"