Switch to CI keystore

CoreWillSoft · Jul 27, 2023 · d6f8851 · d6f8851
1 parent 0eb9318
commit d6f8851
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 74 deletions.
diff --git a/.github/workflows/beta-to-testers-app-center.yaml b/.github/workflows/beta-to-testers-app-center.yaml
@@ -6,17 +6,28 @@ on:
       - main
 jobs:
   build:
-    if: false # remove when ready
+    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
     runs-on: ubuntu-latest
-
+    env:
+      ANDROID_KEYSTORE_PATH_DEV: "../keystore.jks"
+      ANDROID_KEYSTORE_PASSWORD_DEV: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEY_ALIAS_DEV: ${{ secrets.ANDROID_KEY_ALIAS }}
+      ANDROID_KEY_PASSWORD_DEV: ${{ secrets.ANDROID_KEY_PASSWORD }}
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 11.0.16+1
+          cache: 'gradle'
+      - name: save keystore file to local env
+        uses: "finnp/create-file-action@master"
+        env:
+          FILE_NAME: "keystore.jks"
+          FILE_BASE64: ${{ secrets.ANDROID_KEYSTORE_FILE_BASE64 }}
       - name: build debug
         run: ./gradlew assembleDebug
       - name: Prepare release notes

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,6 +10,7 @@ on:
 jobs:
   validation:
     name: Validation
+    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest code

diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
@@ -9,29 +9,32 @@ on:
       - '*'
 
 jobs:
-  gradle:
-    strategy:
-      matrix:
-        os: ubuntu-latest
-    runs-on: ${{ matrix.os }}
+  build:
+    runs-on: ubuntu-latest
     if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
+    env:
+      ANDROID_KEYSTORE_PATH: "../keystore.jks"
+      ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+      ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
+      ANDROID_KEYSTORE_PATH_DEV: "../keystore.jks"
+      ANDROID_KEYSTORE_PASSWORD_DEV: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEY_ALIAS_DEV: ${{ secrets.ANDROID_KEY_ALIAS }}
+      ANDROID_KEY_PASSWORD_DEV: ${{ secrets.ANDROID_KEY_PASSWORD }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - name: Cache Gradle Caches
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches/
-          key: cache-gradle-cache
-      - name: Cache Gradle Wrapper
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/wrapper/
-          key: cache-gradle-wrapper
+          distribution: 'zulu'
+          java-version: 11.0.16+1
+          cache: 'gradle'
+      - name: save keystore file to local env
+        uses: "finnp/create-file-action@master"
+        env:
+          FILE_NAME: "keystore.jks"
+          FILE_BASE64: ${{ secrets.ANDROID_KEYSTORE_FILE_BASE64 }}
       - name: Run Gradle tasks
         run: ./gradlew build check publishToMavenLocal --continue
       - name: Stop Gradle

diff --git a/.github/workflows/publish_debug_firebase.yaml b/.github/workflows/publish_debug_firebase.yaml
@@ -7,16 +7,23 @@ on:
 
 jobs:
   build:
-    if: false # remove when ready
+    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
     runs-on: ubuntu-latest
+    env:
+      ANDROID_KEYSTORE_PATH_DEV: "../keystore.jks"
+      ANDROID_KEYSTORE_PASSWORD_DEV: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEY_ALIAS_DEV: ${{ secrets.ANDROID_KEY_ALIAS }}
+      ANDROID_KEY_PASSWORD_DEV: ${{ secrets.ANDROID_KEY_PASSWORD }}
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 11.0.16+1
+          cache: 'gradle'
       - name: Build debug
         run: ./gradlew assembleDebug
       - name: Prepare release notes

diff --git a/.github/workflows/publish_release_firebase.yaml b/.github/workflows/publish_release_firebase.yaml
@@ -7,16 +7,28 @@ on:
 
 jobs:
   build:
-    if: false # remove when ready
+    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
     runs-on: ubuntu-latest
+    env:
+      ANDROID_KEYSTORE_PATH: "../keystore.jks"
+      ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+      ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 11.0.16+1
+          cache: 'gradle'
+      - name: save keystore file to local env
+        uses: "finnp/create-file-action@master"
+        env:
+          FILE_NAME: "keystore.jks"
+          FILE_BASE64: ${{ secrets.ANDROID_KEYSTORE_FILE_BASE64 }}
       - name: build release
         run: ./gradlew assembleRelease
       - name: sign release build

diff --git a/.github/workflows/release-to-internal-google-play.yaml b/.github/workflows/release-to-internal-google-play.yaml
@@ -6,20 +6,31 @@ on:
       - '*'
 jobs:
   build:
-    if: false # remove when ready
+    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
     runs-on: ubuntu-latest
 
     env:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      ANDROID_KEYSTORE_PATH: "../keystore.jks"
+      ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+      ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 11.0.16+1
+          cache: 'gradle'
+      - name: save keystore file to local env
+        uses: "finnp/create-file-action@master"
+        env:
+          FILE_NAME: "keystore.jks"
+          FILE_BASE64: ${{ secrets.ANDROID_KEYSTORE_FILE_BASE64 }}
       - name: build release
         run: ./gradlew assembleRelease
       - name: check dependencies

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import util.properties
+import java.lang.System.getenv
 
 plugins {
     id("com.android.application")
@@ -51,20 +52,27 @@ android {
     }
     signingConfigs {
         listOf("debug", "release").forEach { configName ->
-            util.SigningData.of(properties(file("config/signing/$configName/signing.properties")))
-                ?.let {
-                    val action = Action<com.android.build.api.dsl.ApkSigningConfig> {
-                        storeFile = file(it.storeFile)
-                        storePassword = it.storePassword
-                        keyAlias = it.keyAlias
-                        keyPassword = it.keyPassword
+            val action = Action<com.android.build.api.dsl.ApkSigningConfig> {
+                when(configName) {
+                    "debug" -> {
+                        storeFile = file(getenv("ANDROID_KEYSTORE_PATH_DEV"))
+                        storePassword = getenv("ANDROID_KEYSTORE_PASSWORD_DEV")
+                        keyAlias = getenv("ANDROID_KEY_ALIAS_DEV")
+                        keyPassword = getenv("ANDROID_KEY_PASSWORD_DEV")
                     }
-                    try {
-                        getByName(configName, action::invoke)
-                    } catch (e: Throwable) {
-                        create(configName, action)
+                    "release" -> {
+                        storeFile = file(getenv("ANDROID_KEYSTORE_PATH"))
+                        storePassword = getenv("ANDROID_KEYSTORE_PASSWORD")
+                        keyAlias = getenv("ANDROID_KEY_ALIAS")
+                        keyPassword = getenv("ANDROID_KEY_PASSWORD")
                     }
                 }
+            }
+            try {
+                getByName(configName, action::invoke)
+            } catch (e: Throwable) {
+                create(configName, action)
+            }
         }
     }
     buildTypes {

diff --git a/app/config/signing/debug/keystore b/app/config/signing/debug/keystore
diff --git a/app/config/signing/debug/signing.properties b/app/config/signing/debug/signing.properties
diff --git a/buildSrc/src/main/kotlin/util/AndroidHelper.kt b/buildSrc/src/main/kotlin/util/AndroidHelper.kt