Update to 1.20.2

.github/workflows/build.yml

@@ -4,10 +4,13 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17, 20]
+        java: [17-ubuntu, 21-ubuntu]
     runs-on: ubuntu-22.04
+    container:
+      image: mcr.microsoft.com/openjdk/jdk:${{ matrix.java }}
+      options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/cache@v3
@@ -18,10 +21,6 @@ jobs:
           key: ${{ runner.os }}-java-${{ matrix.java }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-java-${{ matrix.java }}-gradle-
-      - uses: actions/setup-java@v3
-        with:
-            distribution: temurin
-            java-version: ${{ matrix.java }}
       - uses: gradle/wrapper-validation-action@v1
       # TODO - Go back to "--warning-mode=fail"
       - run: ./gradlew check build publishToMavenLocal --stacktrace --warning-mode=all -Porg.gradle.parallel.threads=4
@@ -30,63 +29,67 @@ jobs:
         with:
           reports: |
             **/build/reports/checkstyle/*.xml
-      # TODO - Re-enable once issues with Quilt Loader are solved
-      # - run: mkdir run && echo "eula=true" >> run/eula.txt
-      # - run: ./gradlew runAutoTestServer --stacktrace --warning-mode=fail
-      - run: ./gradlew --stop
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: build/libs/
       - uses: actions/upload-artifact@v3
         with:
           name: Artifacts
           path: |
             build/libs/
             ./*/build/libs/
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: build/publishMods/
       - uses: actions/upload-artifact@v3
         with:
           name: Maven Local
-          path: /home/runner/.m2/repository
+          path: /root/.m2/repository
+
+  client_test:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'microsoft'
+          java-version: '17'
+      - name: Run Auto test Client
+        uses: modmuss50/xvfb-action@v1
+        with:
+          run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: Test Screenshots
+          path: run/screenshots
 
-  #client_test:
-  #  runs-on: ubuntu-22.04
-  #  steps:
-  #    - uses: actions/checkout@v3
-  #      with:
-  #        fetch-depth: 0
-  #    - uses: actions/setup-java@v3
-  #      with:
-  #        distribution: temurin
-  #        java-version: 17
-  #    - name: Run Auto test Client
-  #      uses: modmuss50/xvfb-action@v1
-  #      with:
-  #        run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
-  #    - uses: actions/upload-artifact@v3
-  #      if: always()
-  #      with:
-  #        name: Test Screenshots
-  #        path: run/screenshots
-  #
-  #server_test:
-  #  runs-on: ubuntu-22.04
-  #  steps:
-  #    - uses: actions/checkout@v3
-  #      with:
-  #        fetch-depth: 0
-  #    - uses: actions/setup-java@v3
-  #      with:
-  #        distribution: temurin
-  #        java-version: 17
-  #    - run: mkdir run && echo "eula=true" >> run/eula.txt
-  #    - run: ./gradlew runProductionAutoTestServer --stacktrace --warning-mode=fail
+  server_test:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'microsoft'
+          java-version: '17'
+      - run: mkdir run && echo "eula=true" >> run/eula.txt
+      - run: ./gradlew runProductionAutoTestServer --stacktrace --warning-mode=fail
 
-  # check_resources:
-  #   runs-on: ubuntu-22.04
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 0
-  #     - uses: actions/setup-java@v3
-  #       with:
-  #         distribution: temurin
-  #         java-version: 17
-  #     - run: ./gradlew generateResources --stacktrace --warning-mode=fail
-  #     - run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi
+  check_resources:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'microsoft'
+          java-version: '17'
+      - run: ./gradlew generateResources --stacktrace --warning-mode=fail
+      - run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi

.github/workflows/release.yml

@@ -7,8 +7,13 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-22.04
+    container:
+      image: mcr.microsoft.com/openjdk/jdk:21-ubuntu
+      options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - run: apt update && apt install git -y && git --version
+      - run: git config --global --add safe.directory /__w/fabric/fabric
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/cache@v3
@@ -19,22 +24,18 @@ jobs:
           key: ${{ runner.os }}-java-17-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-java-17-gradle-
-      - uses: actions/setup-java@v3
-        with:
-            distribution: temurin
-            java-version: 20
       - uses: FabricMC/fabric-action-scripts@v2
         id: changelog
         with:
           context: changelog
           workflow_id: release.yml
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew publish curseforge github modrinth --stacktrace -Porg.gradle.parallel.threads=4
+      - run: ./gradlew build publish publishMods --stacktrace -Porg.gradle.parallel.threads=4
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+          CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CHANGELOG: ${{ steps.changelog.outputs.changelog }}