From b293cce2539448a9432b3eee110854ca83627b4f Mon Sep 17 00:00:00 2001
From: cherbert <tinblue@gmail.com>
Date: Sat, 16 Mar 2024 14:29:28 +0000
Subject: [PATCH] Revert to Jon's original build.yml

---
 .github/workflows/build.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3068294..b31983c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,8 @@ jobs:
       fail-fast: false
       matrix:
         minecraft: [ 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.4 ]
-    runs-on: self-hosted
+    #runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@main
@@ -18,12 +19,16 @@ jobs:
         with:
           java-version: 17
           distribution: 'zulu'
-      - name: Setup ${{ matrix.minecraft }} ${{ matrix.loader }}
-        run: ./gradlew setupLibrary -PbuildVersion="${{ matrix.minecraft }}"
-      - name: Build ${{ matrix.minecraft }} ${{ matrix.loader }}
-        run: ./gradlew build -PbuildVersion="${{ matrix.minecraft }}"
+      - name: Make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: Setup Fabric files
+        run: ./gradlew fabric:setupFiles -PminecraftVersion="${{ matrix.minecraft }}"
+      - name: Setup Forge files
+        run: ./gradlew forge:setupFiles -PminecraftVersion="${{ matrix.minecraft }}"
+      - name: Build ${{ matrix.minecraft }}
+        run: ./gradlew build -PminecraftVersion="${{ matrix.minecraft }}"
       - name: Capture release artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@main
         with:
-          name: Artifacts
-          path: build/release
+          name: Fabric and Forge ${{ matrix.minecraft }}
+          path: build/release/