Cleanup files after transformation

Author: Su5eD

core/src/main/kotlin/org/sinytra/probe/core/platform/ModrinthPlatform.kt

@@ -67,14 +67,7 @@ class ModrinthPlatform(
         val key = versionKey(versionId)
 
         cache.getObject<ModrinthResolvedVersion>(key)
-            ?.let {
-                val path = storagePath.resolve(it.path)
-                if (!path.exists()) {
-                    cache.del(key)
-                    return@let null
-                }
-                return it
-            }
+            ?.let { return it }
 
         LOGGER.info("Fetching '{}' version {}", slug, versionId)
 

core/src/main/kotlin/org/sinytra/probe/core/platform/PlatformService.kt

@@ -29,6 +29,7 @@ data class ResolvedProject(
 
 interface PlatformService {
     suspend fun getProject(slug: String): PlatformProject?
+    // Does not guarantee that the version file exists
     suspend fun getVersion(slug: String, versionId: String): ProjectVersion?
     suspend fun isNeoForgeAvailable(project: PlatformProject, gameVersion: String): Boolean
     suspend fun resolveProject(project: PlatformProject, gameVersion: String): ResolvedProject?
@@ -42,7 +43,7 @@ class GlobalPlatformService(private val platforms: Map<ProjectPlatform, Platform
 
     suspend fun getProject(platform: ProjectPlatform, slug: String): PlatformProject? =
         getPlatform(platform).getProject(slug)
-    
+
     suspend fun isNeoForgeAvailable(project: PlatformProject, gameVersion: String): Boolean =
         getPlatform(project.platform).isNeoForgeAvailable(project, gameVersion)
 

core/src/main/kotlin/org/sinytra/probe/core/service/TransformationService.kt

@@ -54,7 +54,8 @@ class TransformationService(
             null
         }
 
-        workDir.deleteRecursively()
+        // Cleanup files
+        workDir.parent.deleteRecursively()
 
         return TransformationResult(
             project.version.projectId,

gatherer/build.gradle.kts

@@ -83,7 +83,7 @@ tasks {
             "TEST_COUNT" to 10
         )
     }
-    
+
     jar {
         manifest {
             attributes(
@@ -100,6 +100,16 @@ tasks {
 jib {
     from {
         image = "eclipse-temurin:21-jdk"
+        platforms {
+            platform {
+                architecture = "amd64"
+                os = "linux"
+            }
+            platform {
+                architecture = "arm64"
+                os = "linux"
+            }
+        }
     }
     to {
         setImage(

gatherer/src/main/kotlin/org/sinytra/probe/gatherer/internal/TransformerInvoker.kt

@@ -51,7 +51,9 @@ class TransformerInvoker(
             stripAnsiCodes(outputLog)
             stripAnsiCodes(errorLog)
 
-            if (errorLog.readText().isNotEmpty()) {
+            val errorText = errorLog.readText()
+            val filteredLines = errorText.lines().filterNot { it.isBlank() || it.contains("Picked up JAVA_TOOL_OPTIONS") }
+            if (filteredLines.isNotEmpty()) {
                 LOGGER.error("{} Got errors while transforming {}", ICON_WARN, slug)
                 errors = true
             }

service/src/main/kotlin/org/sinytra/probe/service/impl/RoutingImpl.kt

@@ -9,10 +9,12 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import org.sinytra.probe.base.*
 import org.sinytra.probe.base.db.ProjectPlatform
+import org.sinytra.probe.core.model.TestEnvironment
 import org.sinytra.probe.core.model.TestResult
 import org.sinytra.probe.core.platform.GlobalPlatformService
 import org.sinytra.probe.core.platform.ModrinthPlatform.Companion.LOADER_FABRIC
 import org.sinytra.probe.core.platform.ModrinthPlatform.Companion.LOADER_NEOFORGE
+import org.sinytra.probe.core.platform.PlatformProject
 import org.sinytra.probe.core.service.AsyncTransformationRunner
 import org.sinytra.probe.core.service.PersistenceService
 import org.sinytra.probe.core.service.SetupService
@@ -65,21 +67,20 @@ class RoutingImpl(
             )
         }
 
-        val resolved = platforms.resolveProject(project, body.gameVersion)
-            ?: return call.respond(
-                TestResponseBody.Unavailable(
-                    LOADER_FABRIC,
-                    body.gameVersion,
-                    testProject,
-                    ResultType.UNAVAILABLE
-                )
-            )
-
         liveResourceLock.read {
             val neoForgeVersion = setup.getNeoForgeVersion(body.gameVersion)
             val transformer = setup.getTransformLib(body.gameVersion)
             val testEnvironment = persistence.getOrCreateTestEnvironment(transformer.version, body.gameVersion, neoForgeVersion)
-            val result: TestResult = asyncTransform.transform(project, resolved, testEnvironment)
+
+            val result: TestResult = getOrRunTest(project, testEnvironment)
+                ?: return call.respond(
+                    TestResponseBody.Unavailable(
+                        LOADER_FABRIC,
+                        body.gameVersion,
+                        testProject,
+                        ResultType.UNAVAILABLE
+                    )
+                )
 
             val version = platforms.getVersion(project, result.versionId)
             val envDto = TestEnvironmentDTO(testEnvironment.connectorVersion, testEnvironment.gameVersion, testEnvironment.neoForgeVersion)
@@ -101,6 +102,15 @@ class RoutingImpl(
         }
     }
 
+    suspend fun getOrRunTest(project: PlatformProject, testEnvironment: TestEnvironment): TestResult? {
+        val existing = persistence.getExistingResult(project, testEnvironment)
+        if (existing != null) {
+            return existing
+        }
+        val resolved = platforms.resolveProject(project, testEnvironment.gameVersion) ?: return null
+        return asyncTransform.transform(project, resolved, testEnvironment)
+    }
+
     suspend fun importTestReport(body: TestReport) = coroutineScope {
         LOGGER.info("Importing ${body.results.size} test results")