CI fix

Author: kirillt

.github/workflows/_android-build.yml

@@ -94,9 +94,13 @@ jobs:
                       echo "keystore.jks is missing or empty after decrypting ANDROID_KEYSTORE_ENCRYPTED"
                       exit 1
                   fi
-                  keytool -list -keystore keystore.jks -storepass "$ANDROID_KEYSTORE_STORE_PASSWORD" -alias "$ANDROID_KEY_ALIAS" >/dev/null
-                  keytool -certreq -keystore keystore.jks -storepass "$ANDROID_KEYSTORE_STORE_PASSWORD" -alias "$ANDROID_KEY_ALIAS" -keypass "$ANDROID_KEY_PASSWORD" -file android-release-signing.csr >/dev/null
-                  rm -f android-release-signing.csr
+                  KEYSTORE_INFO=$(keytool -list -v -keystore keystore.jks -storepass "$ANDROID_KEYSTORE_STORE_PASSWORD" -alias "$ANDROID_KEY_ALIAS")
+                  echo "$KEYSTORE_INFO" | grep -q "PrivateKeyEntry"
+                  KEYSTORE_TYPE=$(echo "$KEYSTORE_INFO" | sed -n 's/^Keystore type: //p' | head -n 1)
+                  if [ "$KEYSTORE_TYPE" = "JKS" ]; then
+                    keytool -certreq -keystore keystore.jks -storepass "$ANDROID_KEYSTORE_STORE_PASSWORD" -alias "$ANDROID_KEY_ALIAS" -keypass "$ANDROID_KEY_PASSWORD" -file android-release-signing.csr >/dev/null
+                    rm -f android-release-signing.csr
+                  fi
               env:
                   ANDROID_KEYSTORE_ENCRYPTED: ${{ secrets.ANDROID_KEYSTORE_ENCRYPTED }}
                   ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}

composeApp/build.gradle.kts

@@ -114,36 +114,5 @@ dependencies {
     debugImplementation(compose.uiTooling)
 }
 
-val validateAndroidReleaseSigning by tasks.registering {
-    doLast {
-        val missing = listOf(
-            "ANDROID_KEYSTORE_STORE_PASSWORD",
-            "ANDROID_KEY_ALIAS",
-            "ANDROID_KEY_PASSWORD",
-        ).filter { signingValue(it).isNullOrBlank() }
-
-        if (missing.isNotEmpty()) {
-            error("Missing Android release signing values: ${missing.joinToString()}")
-        }
-
-        if (!project.rootProject.file("keystore.jks").isFile) {
-            error("Missing Android release keystore: ${project.rootProject.file("keystore.jks")}")
-        }
-    }
-}
-
-val androidReleaseSigningTasks =
-    setOf(
-        "packageRelease",
-        "bundleRelease",
-        "validateSigningRelease",
-    )
-
-tasks.matching { task ->
-    task.name in androidReleaseSigningTasks
-}.configureEach {
-    dependsOn(validateAndroidReleaseSigning)
-}
-
 tasks.check.dependsOn(tasks.ktlintCheck)
 tasks.ktlintCheck.dependsOn(tasks.ktlintFormat)

fastlane/Fastfile

@@ -144,8 +144,11 @@ platform :ios do
       UI.user_error!("EXPECTED_FIREBASE_PROJECT_ID is required")
     end
 
-    bundled_firebase_plist = "./build/Bundled-GoogleService-Info.plist"
-    sh("unzip -p './build/ARK-Drop.ipa' 'Payload/*.app/GoogleService-Info.plist' > '#{bundled_firebase_plist}'")
+    repo_root = File.expand_path("..", __dir__)
+    ipa_path = lane_context[SharedValues::IPA_OUTPUT_PATH] || File.join(repo_root, "build", "ARK-Drop.ipa")
+    bundled_firebase_plist = File.join(repo_root, "build", "Bundled-GoogleService-Info.plist")
+    sh("mkdir -p '#{File.dirname(bundled_firebase_plist)}'")
+    sh("unzip -p '#{ipa_path}' 'Payload/*.app/GoogleService-Info.plist' > '#{bundled_firebase_plist}'")
     sh("plutil -lint '#{bundled_firebase_plist}'")
 
     bundled_project_id = sh("/usr/libexec/PlistBuddy -c 'Print :PROJECT_ID' '#{bundled_firebase_plist}'").strip