Merge remote-tracking branch 'origin/1.16.5-architectury' into 1.16.5…

…-architectury
ThinkingStudios · Apr 21, 2024 · ecdbc57 · ecdbc57
2 parents 6c04856 + 5051ee1
commit ecdbc57
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
@@ -7,14 +7,14 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -25,13 +25,10 @@ jobs:
         run: |
           chmod +x gradlew
           ./gradlew build
-      - name: Upload artifacts (Forge)
-        uses: actions/upload-artifact@v3
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: Artifact-Forge
-          path: ${{ github.workspace }}/forge/build/libs
-      - name: Upload artifacts (Fabric)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Artifact-Fabric
-          path: ${{ github.workspace }}/fabric/build/libs
+          name: Artifacts
+          path: |
+            ${{ github.workspace }}/forge/build/libs
+            ${{ github.workspace }}/fabric/build/libs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,21 +14,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 20
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 20
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
             .gradle
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'build.gradle') }}
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v3
       - run: |
           chmod +x gradlew
           ./gradlew build publishMod --stacktrace -Porg.gradle.parallel.threads=4