The encrypted certificate of the application. For release and debug #17

IITC-CE · Dec 9, 2018 · 444650e · 444650e
1 parent 9cb75d6
commit 444650e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,38 +1,35 @@
 language: android
 jdk: oraclejdk8
-
 branches:
   only:
   - master
-
 android:
   components:
   - platform-tools
   - tools
   - build-tools-28.0.3
   - android-28
   - extra-android-m2repository
-
 addons:
   apt:
     packages:
     - python3
   ssh_known_hosts: modos189.ru
-
 notifications:
   email:
     on_success: change
     on_failure: always
-
 before_script:
-  - openssl aes-256-cbc -K $encrypted_460819c10bef_key -iv $encrypted_460819c10bef_iv -in deploy_rsa.enc -out /tmp/deploy_rsa -d
-  - chmod 600 /tmp/deploy_rsa
-  - eval "$(ssh-agent -s)"
-  - ssh-add /tmp/deploy_rsa
-  - rm -rf build/local/*
-  - rm -rf build/mobile/*
-
+- openssl aes-256-cbc -K $encrypted_460819c10bef_key -iv $encrypted_460819c10bef_iv
+  -in deploy_rsa.enc -out /tmp/deploy_rsa -d
+- openssl aes-256-cbc -K $encrypted_50771c031334_key -iv $encrypted_50771c031334_iv
+  -in mobile/app/android.jks.enc -out mobile/app/android.jks -d
+- chmod 600 /tmp/deploy_rsa
+- eval "$(ssh-agent -s)"
+- ssh-add /tmp/deploy_rsa
+- rm -rf build/local/*
+- rm -rf build/mobile/*
 script:
-  - "./build.py local"
-  - "./build.py mobile"
-  - "bash ./deploy.sh"
+- "./build.py local"
+- "./build.py mobile"
+- bash ./deploy.sh
diff --git a/mobile/app/android-debug-key.p12 b/mobile/app/android-debug-key.p12
diff --git a/mobile/app/build.gradle b/mobile/app/build.gradle
@@ -36,21 +36,38 @@ android {
     }
 
     signingConfigs {
-        if (project.hasProperty('signKeyStorePassword')) {
+        if (System.getenv("TRAVIS")) {
             release {
-                keyAlias rootProject.ext.signKeyAlias
-                keyPassword rootProject.ext.signKeyPassword
-                storeFile file(rootProject.ext.signKeyStore)
-                storePassword rootProject.ext.signKeyStorePassword
+                storeFile rootProject.file('android.jks')
+                storePassword System.getenv("KEYSTORE_PASS")
+                keyAlias System.getenv("ALIAS_NAME")
+                keyPassword System.getenv("ALIAS_PASS")
             }
-        }
-        if (project.hasProperty('debugSignKeyStorePassword')) {
             debug {
-                keyAlias rootProject.ext.debugSignKeyAlias
-                keyPassword rootProject.ext.debugSignKeyPassword
-                storeFile file(rootProject.ext.debugSignKeyStore)
-                storePassword rootProject.ext.debugSignKeyStorePassword
+                storeFile rootProject.file('android.jks')
+                storePassword System.getenv("KEYSTORE_PASS")
+                keyAlias System.getenv("ALIAS_NAME")
+                keyPassword System.getenv("ALIAS_PASS")
+            }
+        } else {
+
+            if (project.hasProperty('signKeyStorePassword') && new File(rootProject.ext.signKeyStore).exists()) {
+                release {
+                    keyAlias rootProject.ext.signKeyAlias
+                    keyPassword rootProject.ext.signKeyPassword
+                    storeFile file(rootProject.ext.signKeyStore)
+                    storePassword rootProject.ext.signKeyStorePassword
+                }
             }
+            if (project.hasProperty('debugSignKeyStorePassword') && new File(rootProject.ext.debugSignKeyStore).exists()) {
+                debug {
+                    keyAlias rootProject.ext.debugSignKeyAlias
+                    keyPassword rootProject.ext.debugSignKeyPassword
+                    storeFile file(rootProject.ext.debugSignKeyStore)
+                    storePassword rootProject.ext.debugSignKeyStorePassword
+                }
+            }
+
         }
     }