Эх сурвалжийг харах

Correctly return exit code

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 3 жил өмнө
parent
commit
8ac7d46e0f

+ 3 - 3
scripts/runCombinedTest.sh

@@ -15,7 +15,7 @@ scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAM
 
 scripts/wait_for_emulator.sh
 ./gradlew jacocoTestGplayDebugUnitTestReport 
-status=$?
+status=$(( $status | $? ))
 
 if [ ! $status -eq 0 ]; then
     bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
@@ -24,14 +24,14 @@ fi
 ./gradlew installGplayDebugAndroidTest
 scripts/wait_for_server.sh "server"
 ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest
-status=$?
+status=$(( $status | $? ))
 
 if [ ! $status -eq 0 ]; then
     bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
 fi
 
 ./gradlew combinedTestReport
-status=$?
+status=$(( $status | $? ))
 
 curl -o codecov.sh https://codecov.io/bash
 bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5