From 522ccba500b568c288b8eeabf959d2513e843128 Mon Sep 17 00:00:00 2001
From: nea <nea@nea.moe>
Date: Mon, 7 Aug 2023 00:37:47 +0200
Subject: Fix workdir and always upload test results

---
 .github/workflows/build.yml | 1 +
 build.gradle.kts            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f404551d6..379f842d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,6 +38,7 @@ jobs:
         run: ./gradlew test
       - uses: actions/upload-artifact@v3
         name: "Upload test report"
+        if: ${{ !cancelled() }}
         with:
           name: "Test Results"
           path: build/reports/tests/test/
diff --git a/build.gradle.kts b/build.gradle.kts
index cfa9ccb65..4b2085042 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -99,7 +99,8 @@ dependencies {
 
 tasks.withType(Test::class) {
     useJUnitPlatform()
-    this.javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
+    javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
+    workingDir(file("run"))
     systemProperty("junit.jupiter.extensions.autodetection.enabled", "true")
 }
 
-- 
cgit