From 72823c2c3e74b51d024e2d123a3206d65eff1865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Tue, 21 Jan 2020 09:16:31 +0100
Subject: [PATCH] ci: use Diawi URL for iOS only if it's set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/ghcmgr.groovy | 2 +-
 ci/github.groovy | 2 +-
 ci/ios.groovy    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/ghcmgr.groovy b/ci/ghcmgr.groovy
index 37b10789b2..96f4e5c7a1 100644
--- a/ci/ghcmgr.groovy
+++ b/ci/ghcmgr.groovy
@@ -11,7 +11,7 @@ utils = load 'ci/utils.groovy'
 def buildObj(success) {
   def pkg_url = env.PKG_URL
   /* a bare ipa file is not installable on iOS */
-  if (env.TARGET == 'ios') {
+  if (env.TARGET == 'ios' && env.DIAWI_URL != "") {
     pkg_url = env.DIAWI_URL 
   }
   /* assemble build object valid for ghcmgr */
diff --git a/ci/github.groovy b/ci/github.groovy
index 7b0481c1c3..238518a365 100644
--- a/ci/github.groovy
+++ b/ci/github.groovy
@@ -185,7 +185,7 @@ def publishReleaseMobile(path='pkg') {
   def found = findFiles(glob: "${path}/*")
   if (found.size() == 0) {
     sh "ls ${path}"
-    error("No file to  release in ${path}")
+    error("No file to release in ${path}")
   }
   publishRelease(
     version: ghcmgr.utils.getVersion(),
diff --git a/ci/ios.groovy b/ci/ios.groovy
index 1d317fea69..07e05a9d09 100644
--- a/ci/ios.groovy
+++ b/ci/ios.groovy
@@ -63,6 +63,7 @@ def uploadToDiawi() {
   withCredentials([
     string(credentialsId: 'diawi-token', variable: 'DIAWI_TOKEN'),
   ]) {
+    /* This can silently fail with 'File is not processed.' */
     nix.shell(
       'bundle exec --gemfile=fastlane/Gemfile fastlane ios upload_diawi',
       keep: ['FASTLANE_DISABLE_COLORS', 'DIAWI_TOKEN'],