diff options
| author | Stefan Wildemann <gta04@metalstrolche.de> | 2020-05-01 19:53:32 +0200 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2020-05-21 09:05:05 +0200 |
| commit | 3184ae52161d33ebb1c84b72186ff2d49df7eb2a (patch) | |
| tree | 717d5642cb7829b02065498b93c6f2bc3d082a7e | |
| parent | 9c4fe622714c06a4ba16bdd893a4e33d06b4d344 (diff) | |
| download | navit-3184ae52161d33ebb1c84b72186ff2d49df7eb2a.tar.gz | |
fix:build:android: Don't sign apk if no valid keyring is available
This happens usually if building with CI on fork repository
| -rw-r--r-- | fastlane/Fastfile | 5 | ||||
| -rw-r--r-- | navit/android/build.gradle | 4 | ||||
| -rwxr-xr-x | scripts/setup_publish_keys.sh | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 523a1334c..fe5ae6b80 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -31,15 +31,14 @@ platform :android do end lane :playstore do sh("cd ..;bash scripts/build_android.sh") - gradle( task: 'assemble', build_type: 'Release' ) isOnMasterBranch = currentBranch() == "master" if isOnMasterBranch - upload_to_play_store( track: 'beta', - json_key: 'key.json', + upload_to_play_store( track: 'beta', + json_key: 'key.json', apk: 'navit/android/build/outputs/apk/release/android-release.apk', package_name: 'org.navitproject.navit' ) diff --git a/navit/android/build.gradle b/navit/android/build.gradle index 11af35b83..dc19f4f5d 100644 --- a/navit/android/build.gradle +++ b/navit/android/build.gradle @@ -34,7 +34,9 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release + if(file(System.getenv("KEYSTORE") ?: "/store").exists()){ + signingConfig signingConfigs.release + } } } lintOptions { diff --git a/scripts/setup_publish_keys.sh b/scripts/setup_publish_keys.sh index 61ed85b76..2b1331d8e 100755 --- a/scripts/setup_publish_keys.sh +++ b/scripts/setup_publish_keys.sh @@ -2,10 +2,10 @@ set -e -if [ -n $GOOGLE_KEY ]; then +if [[ -n $GOOGLE_KEY ]]; then echo $GOOGLE_KEY | base64 -d > key.json fi -if [ -n $KEY ]; then +if [[ -n $KEY ]]; then wget "https://github.com/navit-gps/infrastructure-blackbox/raw/master/keyrings/keystore.gpg" openssl aes-256-cbc -d -in keystore.gpg -md md5 -k $KEY > ~/.keystore keytool -importkeystore -srcstorepass "$STORE_PASS" -deststorepass "$STORE_PASS" -srckeystore ~/.keystore -destkeystore ~/.keystore -deststoretype pkcs12 |