From 91adbd5526fc5a8dc80fce3801730eba5029f9d1 Mon Sep 17 00:00:00 2001 From: Colbster937 Date: Mon, 12 Jan 2026 13:35:21 -0600 Subject: [PATCH] use commit sha in snapshot file names --- .github/workflows/gradle.yml | 13 +++++++------ build.gradle.kts | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c9efd21..1dbfdd0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,22 +58,23 @@ jobs: run: | echo "TAG_NAME=${{ format('v{0}{1}', steps.vars.outputs.VERS, steps.ghck.outputs.EXISTS == 'true' && format('+{0}', steps.vars.outputs.COMMIT_HASH) || '') }}" >> "$GITHUB_OUTPUT" echo "REL_NAME=${{ format('{0}{1}', steps.ghck.outputs.EXISTS == 'true' && 'Snapshot ' || 'v', steps.ghck.outputs.EXISTS == 'true' && steps.vars.outputs.COMMIT_HASH || steps.vars.outputs.VERS) }}" >> "$GITHUB_OUTPUT" + echo "ART_NAME=${{ format('{0}{1}.jar', steps.vars.outputs.AFCT, steps.ghck.outputs.EXISTS == 'true' && format('+{0}', steps.vars.outputs.COMMIT_HASH) || '') }}" >> "$GITHUB_OUTPUT" - run: | mkdir -p dist - cp "./build/libs/${{ steps.vars.outputs.AFCT }}" ./dist + cp "./build/libs/${{ steps.vars.outputs.AFCT }}.jar" ./dist/${{ steps.dist.outputs.ART_NAME }} - uses: actions/upload-artifact@v4 with: - path: dist/${{ steps.vars.outputs.AFCT }} - name: ${{ steps.vars.outputs.AFCT }} + path: dist/${{ steps.dist.outputs.ART_NAME }} + name: ${{ steps.dist.outputs.ART_NAME }} - if: github.event_name == 'push' && github.ref == 'refs/heads/main' uses: softprops/action-gh-release@v2 with: tag_name: ${{ steps.dist.outputs.TAG_NAME }} name: ${{ steps.dist.outputs.REL_NAME }} - files: dist/${{ steps.vars.outputs.AFCT }} + files: dist/${{ steps.dist.outputs.ART_NAME }} prerelease: ${{ steps.ghck.outputs.EXISTS == 'true' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -86,8 +87,8 @@ jobs: version: ${{ steps.dist.outputs.TAG_NAME }} loaders: '["bukkit", "bungeecord", "paper", "purpur", "spigot", "velocity", "waterfall"]' game-versions: '["1.8.x", "1.9.x", "1.10.x", "1.11.x", "1.12.x", "1.13.x", "1.14.x", "1.15.x", "1.16.x", "1.17.x", "1.18.x", "1.19.x", "1.20.x", "1.21.x"]' - files: dist/${{ steps.vars.outputs.AFCT }} - primary-file: ${{ steps.vars.outputs.AFCT }} + files: dist/${{ steps.dist.outputs.ART_NAME }} + primary-file: ${{ steps.dist.outputs.ART_NAME }} name: ${{ steps.dist.outputs.REL_NAME }} channel: ${{ steps.ghck.outputs.EXISTS == 'true' && 'beta' || 'release' }} dependencies: |- diff --git a/build.gradle.kts b/build.gradle.kts index ec383b3..2523711 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -158,7 +158,7 @@ tasks.register("printVars") { group = "help" doLast { println("VERS = " + PLUGIN_VERS) - println("AFCT = " + tasks.named("shadowJar").get().outputs.files.singleFile.name) + println("AFCT = " + tasks.named("shadowJar").get().outputs.files.singleFile.name.removeSuffix(".jar")) } }