From 52b802517fc7d172fb54c45bc813464c70cdca52 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 21 Apr 2021 11:05:38 +0200
Subject: [PATCH] gitlab-ci: fix broken logic for running publish when
 signatures are there

!8834
92f77359dd152a9c8e18fd0ec4846fae0e9d9070
---
 .gitlab-ci.yml                                   |  4 +++-
 ...n-publish.py => build-contains-signatures.py} | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)
 rename tools/{should-run-publish.py => build-contains-signatures.py} (56%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3af3d5942e..cacdc3fad7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -243,7 +243,9 @@ fdroid build:
           chown -R vagrant $VAGRANT_HOME;
           $fdroid fetchsrclibs $build --verbose;
           $fdroid build --verbose --test --scan-binary --on-server --no-tarball $build;
-          ./tools/should-run-publish.py $build && (apt-get install sudo; $fdroid publish --verbose $build);
+          ./tools/build-contains-signatures.py $build || continue;
+          apt-get install sudo;
+          $fdroid publish --verbose $build;
       done
 
 
diff --git a/tools/should-run-publish.py b/tools/build-contains-signatures.py
similarity index 56%
rename from tools/should-run-publish.py
rename to tools/build-contains-signatures.py
index 56c23dae01..fc70cab088 100755
--- a/tools/should-run-publish.py
+++ b/tools/build-contains-signatures.py
@@ -8,17 +8,29 @@ import yaml
 from colorama import Fore, Style
 
 if len(sys.argv) != 2:
-    print(Fore.RED + ('ERROR: incorrect number of arguments') + Style.RESET_ALL)
+    print(
+        Fore.RED
+        + ('ERROR: incorrect number of arguments: ' + ' '.join(sys.argv[1:]))
+        + Style.RESET_ALL
+    )
     exit(1)
 
 appid, versionCode = sys.argv[1].split(':')
 
 if not glob.glob('metadata/%s/signatures/%s/*' % (appid, versionCode)):
-    print(Fore.RED + ('ERROR: no signatures found') + Style.RESET_ALL)
+    print('no signatures found, skipping publish')
     exit(1)
 
 for f in glob.glob('tmp/%s_%s.apk' % (appid, versionCode)):
     os.rename(f, f.replace('tmp/', 'unsigned/'))
 
 if not glob.glob('unsigned/%s_%s.apk' % (appid, versionCode)):
+    print('no unsigned APK found, skipping publish')
     exit(1)
+
+
+print(
+    Fore.GREEN
+    + ('Found signatures for %s, running publish...' % sys.argv[1])
+    + Style.RESET_ALL
+)