From 3724cbcfd774bae43f6fc3ac3f561922fcb2a5fa Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Thu, 19 Sep 2024 20:49:04 +0200
Subject: Fix up previous work on detekt

---
 .github/workflows/build.yml  | 31 +++++++++++++------------------
 .github/workflows/detekt.yml |  4 ++--
 2 files changed, 15 insertions(+), 20 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c75f0eef..7c12349e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,15 +18,7 @@ jobs:
         runs-on: ubuntu-latest
         name: "Build and test"
         steps:
-            -   uses: actions/checkout@v3
-            -   name: Set up JDK 21
-                uses: actions/setup-java@v3
-                with:
-                    java-version: 21
-                    distribution: temurin
-                    cache: gradle
-            -   name: Setup gradle
-                uses: gradle/gradle-build-action@v2
+            -   uses: ./.github/actions/setup-normal-workspace
             -   name: Build with Gradle
                 run: ./gradlew assemble -x test --stacktrace
             -   uses: actions/upload-artifact@v3
@@ -42,19 +34,22 @@ jobs:
                 with:
                     name: "Test Results"
                     path: versions/1.8.9/build/reports/tests/test/
+    detekt:
+        name: Run detekt
+        runs-on: ubuntu-latest
+
+        steps:
+            -   uses: ./.github/actions/setup-normal-workspace
+            -   name: Run detekt
+                run: |
+                    ./gradlew detekt --stacktrace
+    
+
     preprocess:
         runs-on: ubuntu-latest
         name: "Build multi version"
         steps:
-            -   uses: actions/checkout@v3
-            -   name: Set up JDK 21
-                uses: actions/setup-java@v3
-                with:
-                    java-version: 21
-                    distribution: temurin
-                    cache: gradle
-            -   name: Setup gradle
-                uses: gradle/gradle-build-action@v2
+            -   uses: ./.github/actions/setup-normal-workspace
             -   name: Enable preprocessor
                 run: |
                     mkdir -p .gradle
diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml
index da0d50daf..708f9a19e 100644
--- a/.github/workflows/detekt.yml
+++ b/.github/workflows/detekt.yml
@@ -7,8 +7,8 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - name: "checkout"
-              uses: actions/checkout@v2
+            - name: "Checkout project"
+              uses: actions/checkout@v4
 
             - name: "detekt"
               uses: natiginfo/action-detekt-all@1.23.7
-- 
cgit