Skip to content

Commit 91adbd5

Browse files
committed
use commit sha in snapshot file names
1 parent 2b1ccd0 commit 91adbd5

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,23 @@ jobs:
5858
run: |
5959
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"
6060
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"
61+
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"
6162
6263
- run: |
6364
mkdir -p dist
64-
cp "./build/libs/${{ steps.vars.outputs.AFCT }}" ./dist
65+
cp "./build/libs/${{ steps.vars.outputs.AFCT }}.jar" ./dist/${{ steps.dist.outputs.ART_NAME }}
6566
6667
- uses: actions/upload-artifact@v4
6768
with:
68-
path: dist/${{ steps.vars.outputs.AFCT }}
69-
name: ${{ steps.vars.outputs.AFCT }}
69+
path: dist/${{ steps.dist.outputs.ART_NAME }}
70+
name: ${{ steps.dist.outputs.ART_NAME }}
7071

7172
- if: github.event_name == 'push' && github.ref == 'refs/heads/main'
7273
uses: softprops/action-gh-release@v2
7374
with:
7475
tag_name: ${{ steps.dist.outputs.TAG_NAME }}
7576
name: ${{ steps.dist.outputs.REL_NAME }}
76-
files: dist/${{ steps.vars.outputs.AFCT }}
77+
files: dist/${{ steps.dist.outputs.ART_NAME }}
7778
prerelease: ${{ steps.ghck.outputs.EXISTS == 'true' }}
7879
env:
7980
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -86,8 +87,8 @@ jobs:
8687
version: ${{ steps.dist.outputs.TAG_NAME }}
8788
loaders: '["bukkit", "bungeecord", "paper", "purpur", "spigot", "velocity", "waterfall"]'
8889
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"]'
89-
files: dist/${{ steps.vars.outputs.AFCT }}
90-
primary-file: ${{ steps.vars.outputs.AFCT }}
90+
files: dist/${{ steps.dist.outputs.ART_NAME }}
91+
primary-file: ${{ steps.dist.outputs.ART_NAME }}
9192
name: ${{ steps.dist.outputs.REL_NAME }}
9293
channel: ${{ steps.ghck.outputs.EXISTS == 'true' && 'beta' || 'release' }}
9394
dependencies: |-

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ tasks.register("printVars") {
158158
group = "help"
159159
doLast {
160160
println("VERS = " + PLUGIN_VERS)
161-
println("AFCT = " + tasks.named("shadowJar").get().outputs.files.singleFile.name)
161+
println("AFCT = " + tasks.named("shadowJar").get().outputs.files.singleFile.name.removeSuffix(".jar"))
162162
}
163163
}
164164

0 commit comments

Comments
 (0)