Skip to content

Commit cf15b26

Browse files
OptiJavaOptiJava
committed
ci: try to fix github action
1 parent 066de49 commit cf15b26

5 files changed

Lines changed: 40 additions & 34 deletions

File tree

‎.github/scripts/sort_artifacts.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ done
1212
for i in $dir
1313
do
1414
dst_dir="processed_artifacts/$i"
15-
find "artifacts" -type f -name "*$i*.jar" -exec mv {} "$dst_dir" \;
15+
find "artifacts" -type f -name "*-mc$i.jar" -exec mv {} "$dst_dir" \;
1616
done

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
steps:
2020
- name: checkout repository
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
- name: validate gradle wrapper
23-
uses: gradle/actions/wrapper-validation@v4
23+
uses: gradle/actions/wrapper-validation@v6
2424
- name: setup jdk ${{ matrix.java }}
2525
uses: actions/setup-java@v5
2626
with:
@@ -35,12 +35,18 @@ jobs:
3535
run: ./gradlew build
3636

3737
- name: collect artifacts to out folder
38+
if: ${{ runner.os == 'Linux' && matrix.java == '25' }}
3839
run: |
3940
mkdir out
4041
bash ./.github/scripts/build_output.sh
42+
43+
- name: sort artifacts by game version
44+
run: |
45+
bash ./.github/scripts/sort_artifacts.sh
46+
4147
- name: capture build artifacts
42-
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
43-
uses: actions/upload-artifact@v4
48+
if: ${{ runner.os == 'Linux' && matrix.java == '25' }}
49+
uses: actions/upload-artifact@v7
4450
with:
4551
name: artifacts
46-
path: out/
52+
path: processed_artifacts/

‎.github/workflows/publish.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
contents: write
2929
steps:
3030
- name: checkout repository
31-
uses: actions/checkout@v3.5.3
31+
uses: actions/checkout@v6
3232
- name: download build artifacts
33-
uses: actions/download-artifact@v4
33+
uses: actions/download-artifact@v8
3434
with:
3535
name: artifacts
3636
path: artifacts
@@ -57,51 +57,51 @@ jobs:
5757
echo @@@@@###########################################@@@@@
5858
continue-on-error: true
5959

60-
- name: Publish Minecraft Mods 1.17
61-
uses: Kir-Antipov/mc-publish@v3.3
60+
- name: Publish Minecraft Mods 1.21
61+
uses: Kir-Antipov/mc-publish@v3
6262
with:
6363
modrinth-id: SB7oe4aB
6464
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
6565

6666
curseforge-id: 891699
6767
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
6868

69-
files: processed_artifacts/1.17.1/*.jar
69+
files: processed_artifacts/1.21/*.jar
7070

71-
name: v${{ inputs.version }} For Minecraft 1.17
71+
name: v${{ inputs.version }} For Minecraft 1.21
7272
version: v${{ inputs.version }}
7373
version-type: ${{ inputs.release_type }}
7474

7575
loaders: fabric
76-
game-versions: '1.17.1'
76+
game-versions: '1.21'
7777
game-version-filter: any
7878
dependencies: |-
7979
carpet(required)
8080
fabric-api(required)
81-
81+
8282
modrinth-changelog: 'Got full change logs in [GitHub](https://github.com/OptiJava/OptCarpetAddition/releases).'
8383
curseforge-changelog: 'Got full change logs in [GitHub](https://github.com/OptiJava/OptCarpetAddition/releases).'
84-
84+
8585
retry-attempts: 3
8686
retry-delay: 10000
8787

88-
- name: Publish Minecraft Mods 1.20.4
89-
uses: Kir-Antipov/mc-publish@v3.3
88+
- name: Publish Minecraft Mods 1.21.5
89+
uses: Kir-Antipov/mc-publish@v3
9090
with:
9191
modrinth-id: SB7oe4aB
9292
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
9393

9494
curseforge-id: 891699
9595
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
9696

97-
files: processed_artifacts/1.20.4/*.jar
97+
files: processed_artifacts/1.21.5/*.jar
9898

99-
name: v${{ inputs.version }} For Minecraft 1.20.4
99+
name: v${{ inputs.version }} For Minecraft 1.21.5
100100
version: v${{ inputs.version }}
101101
version-type: ${{ inputs.release_type }}
102102

103103
loaders: fabric
104-
game-versions: '1.20.4'
104+
game-versions: '1.21.5'
105105
game-version-filter: any
106106
dependencies: |-
107107
carpet(required)
@@ -113,23 +113,23 @@ jobs:
113113
retry-attempts: 3
114114
retry-delay: 10000
115115

116-
- name: Publish Minecraft Mods 1.21
117-
uses: Kir-Antipov/mc-publish@v3.3
116+
- name: Publish Minecraft Mods 1.21.11
117+
uses: Kir-Antipov/mc-publish@v3
118118
with:
119119
modrinth-id: SB7oe4aB
120120
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
121121

122122
curseforge-id: 891699
123123
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
124124

125-
files: processed_artifacts/1.21/*.jar
125+
files: processed_artifacts/1.21.11/*.jar
126126

127-
name: v${{ inputs.version }} For Minecraft 1.21
127+
name: v${{ inputs.version }} For Minecraft 1.21.11
128128
version: v${{ inputs.version }}
129129
version-type: ${{ inputs.release_type }}
130130

131131
loaders: fabric
132-
game-versions: '1.21'
132+
game-versions: '1.21.11'
133133
game-version-filter: any
134134
dependencies: |-
135135
carpet(required)
@@ -141,23 +141,23 @@ jobs:
141141
retry-attempts: 3
142142
retry-delay: 10000
143143

144-
- name: Publish Minecraft Mods 1.21.5
145-
uses: Kir-Antipov/mc-publish@v3.3
144+
- name: Publish Minecraft Mods 26.1
145+
uses: Kir-Antipov/mc-publish@v3
146146
with:
147147
modrinth-id: SB7oe4aB
148148
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
149149

150150
curseforge-id: 891699
151151
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
152152

153-
files: processed_artifacts/1.21.5/*.jar
153+
files: processed_artifacts/26.1/*.jar
154154

155-
name: v${{ inputs.version }} For Minecraft 1.21.5
155+
name: v${{ inputs.version }} For Minecraft 26.1
156156
version: v${{ inputs.version }}
157157
version-type: ${{ inputs.release_type }}
158158

159159
loaders: fabric
160-
game-versions: '1.21.5'
160+
game-versions: '26.1'
161161
game-version-filter: any
162162
dependencies: |-
163163
carpet(required)

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
val minecraftVer = stonecutter.current.version
1111
val modver = "${property("mod_version")}"
1212

13-
val modBuildNameSuffix = "v${modver}+build.${SimpleDateFormat("yyMMddHHmm").format(Date())}-${minecraftVer}"
13+
val modBuildNameSuffix = "v${modver}+build.${SimpleDateFormat("yyMMddHHmm").format(Date())}-mc${minecraftVer}"
1414
val archivesBaseName = project.findProperty("archives_base_name")
1515

1616
base {
17-
archivesName.set("${archivesBaseName}+${modBuildNameSuffix}")
17+
archivesName.set("${archivesBaseName}-${modBuildNameSuffix}")
1818
}
1919

2020
repositories {

‎unobfuscated.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
val minecraftVer = stonecutter.current.version
1111
val modver = "${property("mod_version")}"
1212

13-
val modBuildNameSuffix = "v${modver}+build.${SimpleDateFormat("yyMMddHHmm").format(Date())}-${minecraftVer}"
13+
val modBuildNameSuffix = "v${modver}+build.${SimpleDateFormat("yyMMddHHmm").format(Date())}-mc${minecraftVer}"
1414
val archivesBaseName = project.findProperty("archives_base_name")
1515

1616
base {
17-
archivesName.set("${archivesBaseName}+${modBuildNameSuffix}")
17+
archivesName.set("${archivesBaseName}-${modBuildNameSuffix}")
1818
}
1919

2020
repositories {

0 commit comments

Comments
 (0)