From a1545d5b69438e36930348fe3dbbb6e6b8cc6521 Mon Sep 17 00:00:00 2001 From: Antonis Date: Mon, 19 Jun 2017 20:43:50 +0300 Subject: [PATCH] Fixed an issue that didn't allow premium version of Olympus to be uploaded to TF --- scripts/upload-olympus-to-testfairy.bash | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/upload-olympus-to-testfairy.bash b/scripts/upload-olympus-to-testfairy.bash index 588c9093..1f729045 100755 --- a/scripts/upload-olympus-to-testfairy.bash +++ b/scripts/upload-olympus-to-testfairy.bash @@ -17,7 +17,6 @@ then exit 1 fi -echo "-- Building Olympus & uploading to TF -this might take some time..." if [ -z $TESTFAIRY_APP_TOKEN ] then echo "-- Error: TESTFAIRY_APP_TOKEN environment variable missing" @@ -33,14 +32,14 @@ fi # Skip the signArchives task until we properly setup Travis for signing + upload of archives to Sonatype. Otherwise the build breaks cd Examples/restcomm-olympus || exit 1 -if [ -z "$ICE_USERNAME" ] || [ -z "$PICE_PASSWORD" ] || [ -z "$PICE_DOMAIN" ] +if [ -z "$ICE_USERNAME" ] || [ -z "$ICE_PASSWORD" ] || [ -z "$ICE_DOMAIN" ] then echo "-- Error: ICE_USERNAME, ICE_PASSWORD and ICE_DOMAIN need to be set for premium Olympus to be built" exit 1 fi # Upload premium version to TF -echo "-- Uploading premium version to Test Fairy" +echo "-- Building premium version of Olympus & uploading to Test Fairy -this might take some time..." ./gradlew --quiet -x signArchives -x uploadArchives -x androidJavadocs -PICE_USERNAME=$ICE_USERNAME -PICE_PASSWORD=$ICE_PASSWORD -PICE_DOMAIN=$ICE_DOMAIN -PAPPLICATION_ID="org.restcomm.android.olympus.premium" -PtestfairyChangelog="Version: $ORG_GRADLE_PROJECT_VERSION_NAME+$ORG_GRADLE_PROJECT_VERSION_CODE, GitHub commit: $COMMIT_SHA1, premium build" testfairyDebug || exit 1 if [ $? -ne 0 ] then @@ -49,7 +48,7 @@ then fi # Upload community version to TF, so that it gets a separate download point from premium (no need to specify APPLICATION_ID as default is for community) -echo "-- Uploading community version to Test Fairy" +echo "-- Building community version of Olympus & uploading to Test Fairy -this might take some time..." ./gradlew --quiet -x signArchives -x uploadArchives -x androidJavadocs -PtestfairyChangelog="Version: $ORG_GRADLE_PROJECT_VERSION_NAME+$ORG_GRADLE_PROJECT_VERSION_CODE, GitHub commit: $COMMIT_SHA1, community build" testfairyDebug || exit 1 if [ $? -ne 0 ] then