Merge branch 'master' into Add-Aura-PlayerLook-Remove

Team-Astatine · Nov 5, 2024 · 793c601 · 793c601
2 parents 10e9dbc + 635bff4
commit 793c601
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -103,7 +103,7 @@ jobs:
         path: run/screenshots
 
     - name: Create test screenshot gallery
-      if: always() && ${{ env.IMGUR_CLIENT_ID }}
+      if: ${{ env.IMGUR_CLIENT_ID && (success() || failure()) }}
       shell: bash
       run: |
         echo "<details open>" >> $GITHUB_STEP_SUMMARY

diff --git a/build.gradle b/build.gradle
@@ -149,18 +149,10 @@ test {
 	useJUnitPlatform()
 }
 
-task moveDevLibs(dependsOn: [remapJar, remapSourcesJar]) {
-	doLast {
-		def archivesName = project.base.archivesName.get() as String
-		ant.move(file:"${project.buildDir}/devlibs/${archivesName}-${version}-dev.jar", tofile:"${project.buildDir}/libs/${archivesName}-${version}-dev.jar")
-		ant.move(file:"${project.buildDir}/devlibs/${archivesName}-${version}-sources.jar", tofile:"${project.buildDir}/libs/${archivesName}-${version}-sources-dev.jar")
-	}
-}
-
 import org.kohsuke.github.GHReleaseBuilder
 import org.kohsuke.github.GitHub
 
-task github(dependsOn: moveDevLibs) {
+task github(dependsOn: build) {
 	onlyIf {
 		ENV.GITHUB_TOKEN
 	}
@@ -169,7 +161,6 @@ task github(dependsOn: moveDevLibs) {
 		def github = GitHub.connectUsingOAuth(ENV.GITHUB_TOKEN as String)
 		def repository = github.getRepository("Wurst-Imperium/Wurst-MCX2")
 		def ghVersion = version.substring(0, version.indexOf("-"))
-		def archivesName = project.base.archivesName.get() as String
 
 		def ghRelease = repository.getReleaseByTagName(ghVersion as String)
 		if(ghRelease == null) {
@@ -180,7 +171,5 @@ task github(dependsOn: moveDevLibs) {
 
 		ghRelease.uploadAsset(remapJar.archiveFile.get().getAsFile(), "application/java-archive")
 		ghRelease.uploadAsset(remapSourcesJar.archiveFile.get().getAsFile(), "application/java-archive")
-		ghRelease.uploadAsset(new File("${project.buildDir}/libs/${archivesName}-${version}-dev.jar"), "application/java-archive")
-		ghRelease.uploadAsset(new File("${project.buildDir}/libs/${archivesName}-${version}-sources-dev.jar"), "application/java-archive")
 	}
 }