Introduce gradle build cache caching to action and fix formatting.

AppliedEnergistics · Dec 24, 2023 · 615297b · 615297b
1 parent 45ceea7
commit 615297b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/.github/actions/gradle-setup/action.yml b/.github/actions/gradle-setup/action.yml
@@ -15,4 +15,8 @@ runs:
       with:
         distribution: 'microsoft'
         java-version: '17'
-        cache: 'gradle'
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,12 +23,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'microsoft'
-          java-version: '17'
-          cache: 'gradle'
+      - uses: ./.github/actions/gradle-setup
       - name: Validate no assets
         run: test ! -d ./src/generated
       - name: Generate assets

diff --git a/.github/workflows/export_guide.yml b/.github/workflows/export_guide.yml
@@ -18,12 +18,7 @@ jobs:
       - name: Install Software OpenGL Rendering
         run: sudo apt-get install xvfb libgl1-mesa-dri zopfli
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'microsoft'
-          java-version: '17'
-          cache: 'gradle'
+      - uses: ./.github/actions/gradle-setup
       - name: Generate Assets
         run: ./gradlew runData
       - name: Export Guide

diff --git a/.github/workflows/localization.yml b/.github/workflows/localization.yml
@@ -16,10 +16,13 @@ jobs:
         with:
           distribution: 'microsoft'
           java-version: '17'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
       - uses: actions/setup-node@v2
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Download new translations from crowdin

diff --git a/build.gradle b/build.gradle
@@ -314,9 +314,9 @@ test {
     ]
 }
 
-//tasks.named('test').configure {
-//    it.inputs.file(tasks.named('writeMinecraftClasspath').map { it.outputs.files.singleFile })
-//}
+tasks.named('test').configure {
+    it.inputs.file(tasks.named('writeMinecraftClasspath').map { it.outputs.files.singleFile })
+}
 
 dependencies {
     buildtoolsImplementation 'de.siegmar:fastcsv:2.1.0'

diff --git a/src/test/java/appeng/recipes/entropy/EntropyRecipeSerializerTest.java b/src/test/java/appeng/recipes/entropy/EntropyRecipeSerializerTest.java
@@ -22,16 +22,21 @@ void testCodecEncodeMinimal() {
                 .build();
 
         var recipeJson = Recipe.CODEC.encodeStart(JsonOps.INSTANCE, recipe).get().left().get();
-        assertEquals("""
-                {"mode":"cool","input":{"block":{"id":"minecraft:grass_block"}},"output":{"block":{"id":"minecraft:dirt"}},"type":"ae2:entropy"}
-                """.trim(), recipeJson.toString());
+        assertEquals(
+                """
+                        {"mode":"cool","input":{"block":{"id":"minecraft:grass_block"}},"output":{"block":{"id":"minecraft:dirt"}},"type":"ae2:entropy"}
+                        """
+                        .trim(),
+                recipeJson.toString());
     }
 
     @Test
     void testCodecDecodeMinimal() {
-        var jsonEl = new Gson().fromJson("""
-                {"mode":"cool","input":{"block":{"id":"minecraft:grass_block"}},"output":{"block":{"id":"minecraft:dirt"}},"type":"ae2:entropy"}
-                """, JsonElement.class);
+        var jsonEl = new Gson().fromJson(
+                """
+                        {"mode":"cool","input":{"block":{"id":"minecraft:grass_block"}},"output":{"block":{"id":"minecraft:dirt"}},"type":"ae2:entropy"}
+                        """,
+                JsonElement.class);
 
         var recipe = (EntropyRecipe) Recipe.CODEC.decode(JsonOps.INSTANCE, jsonEl).getOrThrow(false, s -> {
             throw new RuntimeException(s);