Skip to content

Commit c3a0792

Browse files
committed
beta
1 parent b055b16 commit c3a0792

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

.github/actions/update-changelog-versioncheck/action.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ runs:
4444
run: |
4545
DEFAULT_BRANCH="${{ steps.checkTagByBranch.outputs.default_branch_result }}"
4646
TARGET_BRANCH="${{ steps.checkTagByBranch.outputs.target_branch_result }}"
47-
47+
48+
CHANGE_LOG=`./gradlew getChangelog --console=plain -q --no-header --no-summary --no-links`
49+
4850
if [ "$DEFAULT_BRANCH" != "$TARGET_BRANCH" ]; then
4951
echo 'Checkout Default Branch'
5052
git stash
5153
git checkout $DEFAULT_BRANCH
5254
fi
53-
54-
CHANGE_LOG=`./gradlew getChangelog --console=plain -q --no-header --no-summary --no-links`
55-
55+
5656
chmod +x ${{ github.action_path }}/scripts/update_version_check.main.kts
5757
${{ github.action_path }}/scripts/update_version_check.main.kts "${{ github.ref_name }}" "$CHANGE_LOG" "${{ github.repository }}"
5858

.github/actions/update-changelog-versioncheck/scripts/update_version_check.main.kts

+16-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ Forgeのバージョン確認Jsonを更新
44
*/
55

66
@file:DependsOn("com.google.code.gson:gson:2.10.1")
7+
@file:DependsOn("com.vdurmont:semver4j:3.1.0")
78

89
import com.google.gson.Gson
910
import com.google.gson.GsonBuilder
1011
import com.google.gson.JsonObject
12+
import com.vdurmont.semver4j.Semver
13+
import com.vdurmont.semver4j.SemverException
1114
import java.io.*
1215
import java.nio.charset.StandardCharsets
1316
import java.nio.file.Files
@@ -72,8 +75,19 @@ for (mcVersion in mcVersions) {
7275
jo.add(mcVersion, vEntry)
7376

7477
promosJo.addProperty("$mcVersion-latest", version)
75-
if (recommended || !promosJo.has("$mcVersion-recommended"))
76-
promosJo.addProperty("$mcVersion-recommended", version)
78+
79+
var flg = true
80+
val pjName = "$mcVersion-recommended"
81+
82+
if (promosJo.has(pjName) && promosJo.isJsonPrimitive && promosJo.getAsJsonPrimitive(pjName).isString) {
83+
try {
84+
flg = !Semver(promosJo.getAsJsonPrimitive(pjName).asString).isStable
85+
} catch (_: SemverException) {
86+
}
87+
}
88+
89+
if (recommended || flg)
90+
promosJo.addProperty(pjName, version)
7791
}
7892

7993
jo.add("promos", promosJo)

.github/workflows/released.yml

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ jobs:
1515
with:
1616
fetch-depth: 0
1717

18+
- name: Cache
19+
uses: actions/cache@v3
20+
with:
21+
path: .gradle/loom-cache
22+
key: ${{ runner.os }}-gradle-loom-cache
23+
1824
- name: Setup
1925
uses: ./.github/actions/setup
2026

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ enabled_platforms=fabric,forge
77
#Mod
88
archives_base_name=otyacraftengine
99
mod_display_name=OtyacraftEngine
10-
mod_version=3.3.0-alpha.2
10+
mod_version=3.3.0-beta.1
1111
#Dependencies
1212
architectury_version=7.0.65
1313
fabric_loader_version=0.14.11
@@ -17,7 +17,7 @@ felnull_version=1.75
1717
#Upload
1818
curesforge_id=400337
1919
modrinth_id=iu3upNjC
20-
release_type=alpha
20+
release_type=beta
2121
maven_put_url=https://maven.felnull.dev/
2222
maven_group=dev.felnull
2323
maven_put_pass=

0 commit comments

Comments
 (0)