Skip to content

Commit 56c59c6

Browse files
committed
ci: better publish
1 parent b324d10 commit 56c59c6

File tree

4 files changed

+30
-17
lines changed

4 files changed

+30
-17
lines changed

.github/scripts/build_output.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
dir=$(ls -l ./versions | awk '/^d/ {print $NF}')
2+
out_dir="./out"
3+
4+
for i in $dir
5+
do
6+
tmp_dir="./versions/$i/build/libs/*.jar"
7+
cp $tmp_dir $out_dir
8+
done

.github/scripts/sort_artifacts.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
dir=$(ls -l ./versions | awk '/^d/ {print $NF}')
2+
3+
# create dirs
4+
mkdir processed_artifacts
5+
for i in $dir
6+
do
7+
tmp_dir="./processed_artifacts/$i"
8+
mkdir "$tmp_dir"
9+
done
10+
11+
# sort files
12+
for i in $dir
13+
do
14+
dst_dir="processed_artifacts/$i"
15+
find "artifacts" -type f -name "*$i*.jar" -exec mv {} "$dst_dir" \;
16+
done

.github/workflows/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ jobs:
3737
- name: collect artifacts to out folder
3838
run: |
3939
mkdir out
40-
mv ./versions/1.17.1/build/libs/* ./out
41-
mv ./versions/1.18.2/build/libs/* ./out
42-
mv ./versions/1.19.3/build/libs/* ./out
43-
mv ./versions/1.20.1/build/libs/* ./out
40+
bash ./.github/scripts/build_output.sh
4441
- name: capture build artifacts
4542
if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
4643
uses: actions/upload-artifact@v3.1.2

.github/workflows/publish.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,7 @@ jobs:
3737

3838
- name: sort artifacts by game version
3939
run: |
40-
mkdir processed_artifacts
41-
mkdir processed_artifacts/17
42-
mkdir processed_artifacts/18
43-
mkdir processed_artifacts/19
44-
mkdir processed_artifacts/20
45-
cp artifacts/*1.17*.jar processed_artifacts/17
46-
cp artifacts/*1.18*.jar processed_artifacts/18
47-
cp artifacts/*1.19*.jar processed_artifacts/19
48-
cp artifacts/*1.20*.jar processed_artifacts/20
40+
bash ./.github/scripts/sort_artifacts.sh
4941
5042
- name: show details for debug
5143
if: ${{ inputs.debug == true }}
@@ -74,7 +66,7 @@ jobs:
7466
curseforge-id: 891699
7567
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
7668

77-
files: processed_artifacts/17/*.jar
69+
files: processed_artifacts/1.17.1/*.jar
7870

7971
name: v${{ inputs.version }} For Minecraft 1.17
8072
version: v${{ inputs.version }}
@@ -102,7 +94,7 @@ jobs:
10294
curseforge-id: 891699
10395
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
10496

105-
files: processed_artifacts/18/*.jar
97+
files: processed_artifacts/1.18.2/*.jar
10698

10799
name: v${{ inputs.version }} For Minecraft 1.18
108100
version: v${{ inputs.version }}
@@ -129,7 +121,7 @@ jobs:
129121
curseforge-id: 891699
130122
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
131123

132-
files: processed_artifacts/19/*.jar
124+
files: processed_artifacts/1.19.3/*.jar
133125

134126
name: v${{ inputs.version }} For Minecraft 1.19.3
135127
version: v${{ inputs.version }}
@@ -156,7 +148,7 @@ jobs:
156148
curseforge-id: 891699
157149
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
158150

159-
files: processed_artifacts/20/*.jar
151+
files: processed_artifacts/1.20.1/*.jar
160152

161153
name: v${{ inputs.version }} For Minecraft 1.20.1
162154
version: v${{ inputs.version }}

0 commit comments

Comments
 (0)