separate key per flavor

kid1412621 · May 9, 2024 · b4ce978 · b4ce978
1 parent 70eb3ae
commit b4ce978
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,9 +5,6 @@ on:
     tags:
       - '*'
 
-env:
-  PROD_RELEASE: true
-
 jobs:
   build_release_github:
     environment: production

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,5 +1,8 @@
 name: Test
 
+env:
+  CI_TEST: true
+
 on:
   push:
     branches: [ "main" ]

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,6 @@ kotlin {
     jvmToolchain(17)
 }
 
-val isProdRelease = System.getenv("PROD_RELEASE")?.toBoolean() ?: false
-
 android {
     namespace = "me.nanova.subspace"
     compileSdk = 34
@@ -39,7 +37,7 @@ android {
         val keystoreDir = "keystore"
         fun buildSignConfig(keyStoreFile: String, apkSigningConfig: ApkSigningConfig) {
             val keystorePropertiesFile = rootProject.file(keyStoreFile)
-            if (isProdRelease) {
+            if (keystorePropertiesFile.exists()) {
                 val keystoreProperties = Properties()
                 keystoreProperties.load(FileInputStream(keystorePropertiesFile))
                 keystoreProperties.let {
@@ -106,11 +104,13 @@ android {
 }
 
 androidComponents {
+    val isCITest = System.getenv("CI_TEST")?.toBoolean() ?: false
+
     onVariants { variant ->
         // disable google service on non-prod build
         val googleTask =
             tasks.findByName("process${variant.name.replaceFirstChar(Char::uppercase)}GoogleServices")
-        googleTask?.enabled = isProdRelease && "debug" != variant.buildType
+        googleTask?.enabled = !isCITest && "release" == variant.buildType
     }
 }