please work :(

rhysdh540 · Oct 16, 2023 · 7251cf9 · 7251cf9
1 parent 96d3d7b
commit 7251cf9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/build-multiver.yml b/.github/workflows/build-multiver.yml
@@ -34,7 +34,7 @@ jobs:
                 uses: actions/cache@v3
                 with:
                     path: ~/.gradle/loom-cache
-                    key: loom-cache-${{ runner.os }}-gradle-${{ hashFiles('~/.gradle/loom-cache/**') }}
+                    key: loom-cache-${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
                     restore-keys: loom-cache-${{ runner.os }}-gradle
 
             -   name: give scripts execution permissions

diff --git a/build.gradle b/build.gradle
@@ -25,6 +25,13 @@ subprojects {
 	remapJar.finalizedBy(mergeJars)
 }
 
+tasks.register("moveJars", AbstractCopyTask) {
+	subprojects.each {
+		from it.buildDir.toPath().resolve("libs").toFile().listFiles()
+		into rootProject.file("artifacts/${rootProject.mcVer}")
+	}
+}
+
 allprojects {
     apply plugin: 'java'
 

diff --git a/buildAll b/buildAll
@@ -10,7 +10,6 @@ for d in versionProperties/*; do
   sh gradlew assemble -PmcVer="$version" || true
   echo "=============================================================== Moving jars ==============================================================="
   echo ''
-  mv "./forge/build/libs/*" "./artifacts/$version/" || true
-  mv "./fabric/build/libs/*" "./artifacts/$version/" || true
+  sh gradlew moveJars -PmcVer="$version" || true
   echo ''
 done