Skip to content

Commit d9d99f0

Browse files
committed
fix: update artifact paths in build and release workflows
1 parent 0bf357b commit d9d99f0

2 files changed

Lines changed: 25 additions & 21 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ jobs:
4545
- name: List build artifacts
4646
run: |
4747
echo "=== Fabric artifacts ==="
48-
ls -lh fabric/build/libs/ 2>/dev/null || echo "No Fabric artifacts found"
48+
find fabric/fabric-*/build/libs -name "*.jar" 2>/dev/null || echo "No Fabric artifacts found"
4949
echo ""
5050
echo "=== Paper artifacts ==="
51-
ls -lh paper/build/libs/ 2>/dev/null || echo "No Paper artifacts found"
51+
find paper/paper-*/build/libs -name "*.jar" 2>/dev/null || echo "No Paper artifacts found"
5252
5353
- name: Upload Fabric artifacts
5454
uses: actions/upload-artifact@v4
5555
if: success()
5656
with:
5757
name: fabric-builds
5858
path: |
59-
fabric/build/libs/*.jar
60-
!fabric/build/libs/*-dev.jar
61-
!fabric/build/libs/*-sources.jar
59+
fabric/fabric-*/build/libs/*.jar
60+
!fabric/fabric-*/build/libs/*-dev.jar
61+
!fabric/fabric-*/build/libs/*-sources.jar
6262
retention-days: 7
6363

6464
- name: Upload Paper artifacts
@@ -67,9 +67,9 @@ jobs:
6767
with:
6868
name: paper-builds
6969
path: |
70-
paper/build/libs/*.jar
71-
!paper/build/libs/*-dev.jar
72-
!paper/build/libs/*-sources.jar
70+
paper/paper-*/build/libs/*.jar
71+
!paper/paper-*/build/libs/*-dev.jar
72+
!paper/paper-*/build/libs/*-sources.jar
7373
retention-days: 7
7474

7575
- name: Check build reports

.github/workflows/release.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,35 @@ jobs:
5151
- name: List build artifacts
5252
run: |
5353
echo "=== Fabric artifacts ==="
54-
ls -lh fabric/build/libs/ || true
54+
find fabric/fabric-*/build/libs -name "*.jar" 2>/dev/null || echo "No Fabric artifacts found"
55+
echo ""
5556
echo "=== Paper artifacts ==="
56-
ls -lh paper/build/libs/ || true
57+
find paper/paper-*/build/libs -name "*.jar" 2>/dev/null || echo "No Paper artifacts found"
5758
5859
- name: Prepare release artifacts
5960
id: artifacts
6061
run: |
6162
mkdir -p release-artifacts
6263
63-
# Copy Fabric builds
64-
if [ -d "fabric/build/libs" ]; then
65-
find fabric/build/libs -name "*.jar" -not -name "*-dev.jar" -not -name "*-sources.jar" -exec cp {} release-artifacts/ \;
66-
fi
64+
# Copy Fabric builds from subprojects
65+
find fabric/fabric-*/build/libs -type f -name "*.jar" -not -name "*-dev.jar" -not -name "*-sources.jar" 2>/dev/null | while read jar; do
66+
cp "$jar" release-artifacts/
67+
echo "Copied: $(basename $jar)"
68+
done
6769
68-
# Copy Paper builds
69-
if [ -d "paper/build/libs" ]; then
70-
find paper/build/libs -name "*.jar" -not -name "*-dev.jar" -not -name "*-sources.jar" -exec cp {} release-artifacts/ \;
71-
fi
70+
# Copy Paper builds from subprojects
71+
find paper/paper-*/build/libs -type f -name "*.jar" -not -name "*-dev.jar" -not -name "*-sources.jar" 2>/dev/null | while read jar; do
72+
cp "$jar" release-artifacts/
73+
echo "Copied: $(basename $jar)"
74+
done
7275
76+
echo ""
7377
echo "=== Release artifacts ==="
74-
ls -lh release-artifacts/
78+
ls -lh release-artifacts/ || echo "No artifacts prepared!"
7579
7680
# Generate artifact list for release notes
7781
echo "ARTIFACTS<<EOF" >> $GITHUB_OUTPUT
78-
ls -1 release-artifacts/ >> $GITHUB_OUTPUT
82+
ls -1 release-artifacts/ 2>/dev/null >> $GITHUB_OUTPUT
7983
echo "EOF" >> $GITHUB_OUTPUT
8084
8185
- name: Generate changelog
@@ -114,7 +118,7 @@ jobs:
114118
115119
### Paper
116120
- For Paper servers: `spectatorplus-paper-${{ steps.version.outputs.VERSION }}.jar`
117-
121+
118122
---
119123
120124
**Full Changelog**: https://github.com/${{ github.repository }}/commits/v${{ steps.version.outputs.VERSION }}

0 commit comments

Comments
 (0)