Update Loom/Gradle and Fabric Loader (#3571)

FabricMC · Feb 8, 2024 · 1802ada · 1802ada
1 parent 9c89d33
commit 1802ada
Show file tree

Hide file tree

Showing 58 changed files with 91 additions and 170 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,13 +4,13 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17-jdk, 20-jdk]
+        java: [17-ubuntu, 21-ubuntu]
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:${{ matrix.java }}
+      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: gradle/wrapper-validation-action@v1
@@ -28,15 +28,19 @@ jobs:
         with:
           name: Artifacts
           path: ./*/build/libs/
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: build/publishMods/
       - uses: actions/upload-artifact@v3
         with:
           name: Maven Local
-          path: /root/.m2/repository
+          path: /root/.m2/repository/net/fabricmc/
 
   client_test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
@@ -56,7 +60,7 @@ jobs:
   server_test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
@@ -69,7 +73,7 @@ jobs:
   check_resources:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,12 +8,12 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:20-jdk
+      image: mcr.microsoft.com/openjdk/jdk:21-ubuntu
       options: --user root
     steps:
       - run: apt update && apt install git -y && git --version
       - run: git config --global --add safe.directory /__w/fabric/fabric
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: FabricMC/fabric-action-scripts@v2
@@ -22,7 +22,7 @@ jobs:
           context: changelog
           workflow_id: release.yml
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew checkVersion build publish curseforge github modrinth --stacktrace -Porg.gradle.parallel.threads=4
+      - run: ./gradlew checkVersion build publish publishMods --stacktrace -Porg.gradle.parallel.threads=4
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}