Handle either/or of wrapper/locks

rahulsom · Jul 15, 2018 · f214373 · f214373
1 parent 9d9fc4a
commit f214373
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/semaphore-build.sh b/semaphore-build.sh
@@ -51,18 +51,28 @@ function commitNewCode() {
     git push
 }
 
+WRAPPER_UPDATED=unknown
 function updateGradleWrapper() {
+    set +e
     local NEW_GRADLE=$(getLatestRelease gradle/gradle)
     echo "Upgrading gradle to $NEW_GRADLE"
     gw wrapper --gradle-version ${NEW_GRADLE} --distribution-type all
     if [ $(git status --short| wc -l) != 0 ]; then
         echo "New gradle found. Testing..."
         gw check && codecov
-        echo "gradlew upgrade works... Checking in changes"
-        commitNewCode "Upgrade gradlew to $NEW_GRADLE"
+        if [ $? = 0 ]; then
+            echo "gradlew update works... Checking in changes"
+            commitNewCode "Upgrade gradlew to $NEW_GRADLE"
+            WRAPPER_UPDATED=yes
+        else
+            git reset --hard
+            WRAPPER_UPDATED=no
+        fi
     else
-        echo "No gradlew upgrade available"
+        echo "No gradlew update available"
+        WRAPPER_UPDATED=no
     fi
+    set -e
 }
 
 function updateDependencyLocks() {
@@ -71,15 +81,19 @@ function updateDependencyLocks() {
         echo "Dependency changes found..."
         gw check && codecov
         echo "New dependencies work. Checking in changes"
-        commitNewCode "Upgrade dependency locks"
+        commitNewCode "Update dependency locks"
     else
         echo "No new dependencies found."
     fi
 }
 
 function main() {
     if [ "$SEMAPHORE_TRIGGER_SOURCE" = "scheduler" ]; then
-        updateGradleWrapper || updateDependencyLocks
+        updateGradleWrapper
+        WRAPPER_UPDATE_STATUS=$?
+        if [ ${WRAPPER_UPDATED} = no -o ${WRAPPER_UPDATE_STATUS} != 0 ]; then
+            updateDependencyLocks
+        fi
     else
         if [ "$PULL_REQUEST_NUMBER" != "" ]; then
             gw check &&  codecov