Merge #112: Cirrus: Skip showconf on download task

8cfcf07 Cirrus: Skip showconf on download task (Jeremy Rand)

Pull request description:

  Fixes https://github.com/namecoin/ncdns-repro/issues/106

tools/cirrus_build_project.sh

@@ -50,20 +50,22 @@ echo "Unpacking git cache..."
 if [[ "$PROJECT" == "release" ]]; then
     echo "release project is never cached."
 else
-    echo "Checking if project is cached..."
+    if [[ "$SHOULD_BUILD" -eq 1 ]]; then
-    OUTDIR="$(./rbm/rbm showconf $PROJECT output_dir --target $CHANNEL --target ncdns-$OS-$ARCH)"
+        echo "Checking if project is cached..."
-    OUTFILE="$(./rbm/rbm showconf $PROJECT filename --target $CHANNEL --target ncdns-$OS-$ARCH)"
+        OUTDIR="$(./rbm/rbm showconf $PROJECT output_dir --target $CHANNEL --target ncdns-$OS-$ARCH)"
-
+        OUTFILE="$(./rbm/rbm showconf $PROJECT filename --target $CHANNEL --target ncdns-$OS-$ARCH)"
-    if [[ "$SHOULD_BUILD" -eq 0 ]]; then
+
-        echo "Cleaning old outputs..."
+        if [[ -e "$OUTDIR/$OUTFILE" ]]; then
-        ./tools/clean-old
+            echo "Project cache hit, skipping build."
-    fi
+            SHOULD_BUILD=0
-
+        else
-    if [[ -e "$OUTDIR/$OUTFILE" ]]; then
+            echo "Project cache miss, proceeding with build."
-        echo "Project cache hit, skipping build."
+        fi
-        SHOULD_BUILD=0
     else
-        echo "Project cache miss, proceeding with build."
+        if [[ "$SHOULD_BUILD" -eq 0 ]]; then
+            echo "Cleaning old outputs..."
+            ./tools/clean-old
+        fi
     fi
 fi