From 575778ab856bdc4ca8518fd46db8dca59f4e98db Mon Sep 17 00:00:00 2001
From: Butterscotch! <bscotchvanilla@gmail.com>
Date: Tue, 9 Dec 2025 07:21:19 -0500
Subject: [PATCH] Don't fail for keystore

---
 .github/workflows/gradle.yaml   |  2 +-
 server/android/build.gradle.kts | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml
index 926e60e30..96475b37e 100644
--- a/.github/workflows/gradle.yaml
+++ b/.github/workflows/gradle.yaml
@@ -42,7 +42,7 @@ jobs:
         run: ./gradlew spotlessCheck
 
       - name: Test with Gradle
-        run: ./gradlew :server:core:test :server:desktop:test
+        run: ./gradlew test
 
   build:
     runs-on: ubuntu-latest
diff --git a/server/android/build.gradle.kts b/server/android/build.gradle.kts
index e2157cd51..9e17b10d0 100644
--- a/server/android/build.gradle.kts
+++ b/server/android/build.gradle.kts
@@ -37,17 +37,18 @@ tasks.register<Copy>("copyGuiAssets") {
 		throw GradleException("You need to run \"pnpm run build\" on the gui folder first!")
 	}
 }
-tasks.preBuild {
-	dependsOn(":server:android:copyGuiAssets")
-
-	// Validate release keystore
+tasks.register("validateKeyStore") {
 	val storeFile = android.buildTypes.getByName("release").signingConfig?.storeFile
+	// Only warn for now since this is run even when irrelevant
 	if (storeFile?.isFile != true) {
-		throw GradleException("Android KeyStore file does not exist or is not a file: ${storeFile?.path}")
+		logger.error("Android KeyStore file does not exist or is not a file: ${storeFile?.path}")
 	} else if (storeFile.length() <= 0) {
-		throw GradleException("Android KeyStore file is empty: ${storeFile.path}")
+		logger.error("Android KeyStore file is empty: ${storeFile.path}")
 	}
 }
+tasks.preBuild {
+	dependsOn(":server:android:copyGuiAssets", ":server:android:validateKeyStore")
+}
 
 tasks.withType<KotlinCompile> {
 	compilerOptions {