Detect if we have a keystore

2 files changed, 4 insertions, 3 deletions

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 828473fea..cf39e9aef 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -32,7 +32,8 @@ platform :android do
   lane :playstore do
     sh("cd ..;bash scripts/build_android.sh")
     isOnMasterBranch = currentBranch() == "master"
-    if isOnMasterBranch
+    #we can only sign if we got the key to unlock the keyring
+    if(File.file?('/home/circleci/.keystore'))
       gradle(
         task: 'assemble',
         build_type: 'Release'
@@ -40,7 +41,7 @@ platform :android do
     else
       gradle(
         task: 'assemble',
-        build_type: 'nonmaster'
+        build_type: 'Notsigned'
       )
     end
     if isOnMasterBranch
diff --git a/navit/android/build.gradle b/navit/android/build.gradle
index bde381777..e2fbd5adc 100644
--- a/navit/android/build.gradle
+++ b/navit/android/build.gradle
@@ -36,7 +36,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
-        nonmaster {
+        notsigned {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }