From 643272446246dc7b7ab19c0dd282c10cae60d880 Mon Sep 17 00:00:00 2001
From: Jan Bliznicenko <jan.bliznicenko@fit.cvut.cz>
Date: Fri, 9 Oct 2020 23:16:50 +0200
Subject: [PATCH] updated travis config

---
 .travis.yml       | 12 +++++++-----
 scripts/deploy.sh |  5 +----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ac44585b..5085f9488 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,19 +8,19 @@ env:
   - BUILD_TIMESTAMP=`date -Is`
 matrix:
   include:
-    - smalltalk: Pharo64-7.0
-      env: PHARO_VERSION="7.0" PHARO_BITS="64"
-    - smalltalk: Pharo32-8.0
-      env: PHARO_VERSION="8.0" PHARO_BITS="32"
     - smalltalk: Pharo64-8.0
       env: PHARO_VERSION="8.0" PHARO_BITS="64"
+    - smalltalk: Pharo32-8.0
+      env: PHARO_VERSION="8.0" PHARO_BITS="32"
     - smalltalk: Pharo64-9.0
       env: PHARO_VERSION="9.0" PHARO_BITS="64"
-  allow_failures:
     - smalltalk: Pharo64-7.0
       env: PHARO_VERSION="7.0" PHARO_BITS="64"
+  allow_failures:
     - smalltalk: Pharo64-9.0
       env: PHARO_VERSION="9.0" PHARO_BITS="64"
+    - smalltalk: Pharo64-7.0
+      env: PHARO_VERSION="7.0" PHARO_BITS="64"
 before_install:
   - echo $PROJECT_NAME
   - echo $FULL_PROJECT_NAME
@@ -39,7 +39,9 @@ before_install:
 deploy:
   - provider: script
     on:
+      all_branches: true
       smalltalk: Pharo64-8.0
+      condition: $TRAVIS_BRANCH = master || $TRAVIS_BRANCH = $TRAVIS_TAG
     skip_cleanup: true
     script: 
       bash scripts/trigger_dependent.sh "class-editor" "borm-editor" "fsm-editor" "petrinets" "all-in-one"      
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index b2b6cc1f3..a65c5fde8 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -35,7 +35,7 @@ upload() {
 	local platform=$1
 	local package_dir_name="openponk-$PROJECT_NAME-$platform"
 	local working_dir="$package_dir_name-$BUILD_VERSION"
-	local zip="$package_dir_name-latest.zip"
+	local zip="$package_dir_name-$BUILD_VERSION.zip"
 
 	cd "$working_dir"
 	zip -qr "$zip" "${package_dir_name}"
@@ -152,6 +152,3 @@ if [[ -n "$TRAVIS_TAG" ]]; then
 	export BUILD_VERSION="$TRAVIS_TAG"
 	main
 fi
-
-return 0
-