From d42d83321b2997551dc8e7227f3c47967d32236e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 6 Sep 2017 16:59:04 +0200
Subject: [PATCH] gitlab-ci: don't fail build if clbin fails

clbin is just for making the logs easy to read, if it fails, the build
should not be marked as failed, especially since the logs are probably
not needed if the rest of the job succeeded.
---
 .gitlab-ci.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 029eb22f4..0c6d23da2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,4 @@
-image: registry.gitlab.com/eighthave/ci-images-client:latest
-# re-enable once gitlab support fixes the repo :-/
-#image: registry.gitlab.com/fdroid/ci-images-client:latest
+image: registry.gitlab.com/fdroid/ci-images-client:latest
 
 cache:
   paths:
@@ -28,7 +26,7 @@ test:
     - ./gradlew test -PdisablePreDex || {
           for log in app/build/reports/*ests/*/*ml; do
               echo "read $log here:";
-              cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+              (cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com) || true;
           done;
           export EXITVALUE=1;
       }
@@ -46,13 +44,13 @@ connected10:
     - ./gradlew connectedCheck -PdisablePreDex || {
         adb -e logcat -d '*:E';
         echo "get the full logcat here:";
-        adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com;
+        (adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com) || true;
         export EXITVALUE=1;
       }
     - for log in app/build/reports/*ests/*/*ml
                  app/build/outputs/*results*/connected/*.xml; do
         echo "read $log here:";
-        cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+        (cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com) || true;
       done
   allow_failure: true
 
@@ -70,13 +68,13 @@ connected24:
     - ./gradlew connectedCheck -PdisablePreDex || {
         adb -e logcat -d '*:E';
         echo "get the full logcat here:";
-        adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com;
+        (adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com) || true;
         export EXITVALUE=1;
       }
     - for log in app/build/reports/*ests/*/*ml
                  app/build/outputs/*results*/connected/*.xml; do
         echo "read $log here:";
-        cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+        (cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com) || true;
       done
     - exit $EXITVALUE