Updating build script.

Banbeucmas · Jul 28, 2018 · 1a87135 · 1a87135
1 parent dbd7ce3
commit 1a87135
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/.travis/build.sh b/.travis/build.sh
@@ -3,7 +3,7 @@
 set -e # Exit with nonzero exit code if anything fails
 SOURCE_BRANCH="master"
 
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
     ./gradlew build
 else
     ./gradlew build \
@@ -14,15 +14,13 @@ else
     -PnexusUsername=$sonatypeUsername \
     -PnexusPassword=$sonatypePassword
 
-    if [ "$TRAVIS_BRANCH" == "$SOURCE_BRANCH" ]; then
-        ./gradlew sonarqube \
-        -Penable.signing=true \
-        -Psigning.keyId=D1115C87 \
-        -Psigning.password=$signingPassword \
-        -Psigning.secretKeyRingFile="$TRAVIS_BUILD_DIR/signing.gpg" \
-        -PnexusUsername=$sonatypeUsername \
-        -PnexusPassword=$sonatypePassword
-    fi
+    ./gradlew sonarqube \
+    -Penable.signing=true \
+    -Psigning.keyId=D1115C87 \
+    -Psigning.password=$signingPassword \
+    -Psigning.secretKeyRingFile="$TRAVIS_BUILD_DIR/signing.gpg" \
+    -PnexusUsername=$sonatypeUsername \
+    -PnexusPassword=$sonatypePassword
 
     ./gradlew publish \
     -Penable.signing=true \