Fix uploads, part 4 (#122)

turikhay · Mar 23, 2024 · 238c603 · 238c603
1 parent d906882
commit 238c603
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,10 +8,9 @@ on:
         type: string
       spigot-target:
         type: string
-      hangar-upload:
-        type: boolean
-      modrinth-upload:
-        type: boolean
+      task:
+        type: string
+        default: build
     outputs:
       artifact:
         description: Path to the jar artifact
@@ -51,14 +50,12 @@ jobs:
       - name: Run the build
         run: |
           ./gradlew \
-          build \
+          ${{ inputs.task }} \
           -Pversion=${{ inputs.version }} \
           -Pspigot_version=${{ steps.target.outputs.spigot-version }} \
           -PprotocolLib_version=4.2.1
         env:
-          HANGAR_UPLOAD: ${{ inputs.hangar-upload }}
           HANGAR_TOKEN: ${{ secrets.hangar-token }}
-          MODRINTH_UPLOAD: ${{ inputs.modrinth-upload }}
           MODRINTH_TOKEN: ${{ secrets.modrinth-token }}
       - name: Force original path preservation (for upload-artifact@v3)
         run: touch .empty

diff --git a/.github/workflows/hangar.yml b/.github/workflows/hangar.yml
@@ -12,6 +12,6 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       version: ${{ needs.version.outputs.version }}
-      hangar-upload: true
+      task: publishPluginPublicationToHangar
     secrets:
       hangar-token: ${{ secrets.HANGAR_TOKEN }}
diff --git a/.github/workflows/modrinth.yml b/.github/workflows/modrinth.yml
@@ -12,6 +12,6 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       version: ${{ needs.version.outputs.version }}
-      modrinth-upload: true
+      task: modrinth
     secrets:
       modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
diff --git a/packages/single/build.gradle.kts b/packages/single/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(project(":velocity"))
 }
 
-val dedupShadowJar by tasks.named("dedupShadowJar")
+val dedupShadowJar = tasks.named("dedupShadowJar")
 val semVer = SemVer.parse(project.version as String)
 val isRelease = semVer.preRelease == null
 val updatePages = isRelease || System.getenv("UPDATE_PAGES") == "true"
@@ -125,12 +125,4 @@ tasks {
                 getByName("syncAllPluginPublicationPagesToHangar")
         )
     }
-    assemble {
-        if (System.getenv("MODRINTH_UPLOAD") == "true") {
-            dependsOn("modrinth")
-        }
-        if (System.getenv("HANGAR_UPLOAD") == "true") {
-            dependsOn("publishPluginPublicationToHangar")
-        }
-    }
 }