[release/3.6] 更新 Jenkins CI 服务器的发布模型 (#4582)

https://github.com/HMCL-dev/HMCL/pull/4559

HMCL/build.gradle.kts

@@ -1,4 +1,7 @@
+import org.jackhuang.hmcl.gradle.ci.GitHubActionUtils
+import org.jackhuang.hmcl.gradle.ci.JenkinsUtils
 import org.jackhuang.hmcl.gradle.mod.ParseModDataTask
+import org.jackhuang.hmcl.gradle.utils.PropertiesUtils
 import java.net.URI
 import java.nio.file.FileSystems
 import java.nio.file.Files
@@ -12,30 +15,36 @@ plugins {
     alias(libs.plugins.shadow)
 }
 
-val isOfficial = System.getenv("HMCL_SIGNATURE_KEY") != null
-        || (System.getenv("GITHUB_REPOSITORY_OWNER") == "HMCL-dev" && System.getenv("GITHUB_BASE_REF")
-    .isNullOrEmpty())
+val projectConfig = PropertiesUtils.load(rootProject.file("config/project.properties").toPath())
+
+val isOfficial = JenkinsUtils.IS_ON_CI || GitHubActionUtils.IS_ON_OFFICIAL_REPO
 
-val buildNumber = System.getenv("BUILD_NUMBER")?.toInt().let { number ->
-    val offset = System.getenv("BUILD_NUMBER_OFFSET")?.toInt() ?: 0
-    if (number != null) {
-        (number - offset).toString()
-    } else {
-        val shortCommit = System.getenv("GITHUB_SHA")?.lowercase()?.substring(0, 7)
-        val prefix = if (isOfficial) "dev" else "unofficial"
-        if (!shortCommit.isNullOrEmpty()) "$prefix-$shortCommit" else "SNAPSHOT"
-    }
-}
-val versionRoot = System.getenv("VERSION_ROOT") ?: "3.6"
 val versionType = System.getenv("VERSION_TYPE") ?: if (isOfficial) "nightly" else "unofficial"
+val versionRoot = System.getenv("VERSION_ROOT") ?: projectConfig.getProperty("versionRoot") ?: "3"
 
 val microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
 val microsoftAuthSecret = System.getenv("MICROSOFT_AUTH_SECRET") ?: ""
 val curseForgeApiKey = System.getenv("CURSEFORGE_API_KEY") ?: ""
 
-val launcherExe = System.getenv("HMCL_LAUNCHER_EXE")
+val launcherExe = System.getenv("HMCL_LAUNCHER_EXE") ?: ""
 
-version = "$versionRoot.$buildNumber"
+val buildNumber = System.getenv("BUILD_NUMBER")?.toInt()
+if (buildNumber != null) {
+    version = if (JenkinsUtils.IS_ON_CI && versionType == "dev") {
+        "$versionRoot.0.$buildNumber"
+    } else {
+        "$versionRoot.$buildNumber"
+    }
+} else {
+    val shortCommit = System.getenv("GITHUB_SHA")?.lowercase()?.substring(0, 7)
+    version = if (shortCommit.isNullOrBlank()) {
+        "$versionRoot.SNAPSHOT"
+    } else if (isOfficial) {
+        "$versionRoot.dev-$shortCommit"
+    } else {
+        "$versionRoot.unofficial-$shortCommit"
+    }
+}
 
 dependencies {
     implementation(project(":HMCLCore"))
@@ -43,7 +52,7 @@ dependencies {
     implementation(libs.twelvemonkeys.imageio.webp)
     implementation(libs.java.info)
 
-    if (launcherExe == null) {
+    if (launcherExe.isBlank()) {
         implementation(libs.hmclauncher)
     }
 }
@@ -162,7 +171,7 @@ tasks.shadowJar {
         }
     }
 
-    if (launcherExe != null) {
+    if (launcherExe.isNotBlank()) {
         into("assets") {
             from(file(launcherExe))
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/CreateAccountPane.java

@@ -267,7 +267,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                     }).executor(true);
         };
 
-        if (factory instanceof OfflineAccountFactory && username != null && !USERNAME_CHECKER_PATTERN.matcher(username).matches()) {
+        if (factory instanceof OfflineAccountFactory && username != null && (!USERNAME_CHECKER_PATTERN.matcher(username).matches() || username.length() > 16)) {
             JFXButton btnYes = new JFXButton(i18n("button.ok"));
             btnYes.getStyleClass().add("dialog-error");
             btnYes.setOnAction(e -> doCreate.run());

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -124,7 +124,7 @@ account.methods.microsoft.purchase=Buy Minecraft
 account.methods.microsoft.snapshot=You are using an unofficial build of HMCL. Please download the official build to log in.
 account.methods.microsoft.snapshot.website=Official Website
 account.methods.offline=Offline
-account.methods.offline.name.special_characters=Using only English letters, numbers, and underscores is recommended
+account.methods.offline.name.special_characters=Use only letters, numbers, and underscores (max 16 chars)
 account.methods.offline.name.invalid=It is recommended to use only English letters, numbers and underscores for the username, and the length should not exceed 16 characters.\n\
    \n\
    \  · Legitimate: HuangYu, huang_Yu, Huang_Yu_123;\n\

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -131,7 +131,7 @@ account.methods.ban_query=查詢帳戶是否被封禁
 account.methods.microsoft.snapshot=你正在使用第三方提供的 HMCL。請下載官方版本進行登入。
 account.methods.microsoft.snapshot.website=官方網站
 account.methods.offline=離線模式
-account.methods.offline.name.special_characters=建議使用英文字母、數字以及底線命名
+account.methods.offline.name.special_characters=建議使用英文字母、數字以及底線命名，且長度不超過 16 個字元
 account.methods.offline.name.invalid=遊戲使用者名稱建議僅使用英文字母、數字及底線，且長度不超過 16 個字元。\n\
   \n\
   \  · 一些有效的使用者名稱：HuangYu、huang_Yu、Huang_Yu_123；\n\

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -139,7 +139,7 @@ account.methods.ban_query=检测账户是否被封禁
 account.methods.microsoft.snapshot=你正在使用第三方提供的 HMCL。请下载官方版本来登录微软账户。
 account.methods.microsoft.snapshot.website=官方网站
 account.methods.offline=离线模式
-account.methods.offline.name.special_characters=建议使用英文字符、数字以及下划线命名
+account.methods.offline.name.special_characters=建议使用英文字符、数字以及下划线命名，且长度不超过 16 个字符
 account.methods.offline.name.invalid=游戏用户名建议仅使用英文字母、数字及下划线，且长度不超过 16 个字符。\n\
   \n\
   \  · 一些合法用户名：HuangYu、huang_Yu、Huang_Yu_123；\n\

HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java

@@ -78,7 +78,7 @@ public final class BMCLAPIDownloadProvider implements DownloadProvider {
                 pair("https://maven.fabricmc.net", apiRoot + "/maven"),
                 pair("https://authlib-injector.yushi.moe", apiRoot + "/mirrors/authlib-injector"),
                 pair("https://repo1.maven.org/maven2", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public"),
-                pair("https://zkitefly.github.io/unlisted-versions-of-minecraft", "https://vip.123pan.cn/1821946486/unlisted-versions-of-minecraft")
+                pair("https://zkitefly.github.io/unlisted-versions-of-minecraft", "https://alist.8mi.tech/d/mirror/unlisted-versions-of-minecraft/Auto")
         );
     }
 

HMCLCore/src/main/resources/assets/game/versions.txt

@@ -831,4 +831,19 @@
 1.21.7-rc2
 1.21.7
 1.21.8-rc1
-1.21.8
+1.21.8
+25w31a
+25w32a
+25w33a
+25w34a
+25w34b
+25w35a
+25w36a
+25w36b
+25w37a
+1.21.9-pre1
+1.21.9-pre2
+1.21.9-pre3
+1.21.9-pre4
+1.21.9-rc1
+1.21.9

build.gradle.kts

@@ -18,7 +18,14 @@ subprojects {
             name = "libs"
             dirs = setOf(rootProject.file("lib"))
         }
-        mavenCentral()
+
+        System.getenv("MAVEN_CENTRAL_REPO").let { repo ->
+            if (repo.isNullOrBlank())
+                mavenCentral()
+            else
+                maven(url = repo)
+        }
+
         maven(url = "https://jitpack.io")
         maven(url = "https://libraries.minecraft.net")
     }

buildSrc/build.gradle.kts

@@ -1,5 +1,10 @@
 repositories {
-    mavenCentral()
+    System.getenv("MAVEN_CENTRAL_REPO").let { repo ->
+        if (repo.isNullOrBlank())
+            mavenCentral()
+        else
+            maven(url = repo)
+    }
 }
 
 dependencies {

buildSrc/src/main/java/org/jackhuang/hmcl/gradle/ci/GitHubActionUtils.java

@@ -0,0 +1,32 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <[email protected]> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.gradle.ci;
+
+import java.util.Objects;
+
+/// @author Glavo
+public final class GitHubActionUtils {
+    private static final String OFFICIAL_ORGANIZATION = "HMCL-dev";
+
+    public static final boolean IS_ON_OFFICIAL_REPO =
+            OFFICIAL_ORGANIZATION.equalsIgnoreCase(System.getenv("GITHUB_REPOSITORY_OWNER"))
+                    && Objects.requireNonNullElse(System.getenv("GITHUB_BASE_REF"), "").isBlank();
+
+    private GitHubActionUtils() {
+    }
+}

buildSrc/src/main/java/org/jackhuang/hmcl/gradle/ci/JenkinsUtils.java

@@ -0,0 +1,27 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <[email protected]> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.gradle.ci;
+
+/// @author Glavo
+public final class JenkinsUtils {
+
+    public static final boolean IS_ON_CI = "1".equals(System.getenv("HMCL_CI"));
+
+    private JenkinsUtils() {
+    }
+}

buildSrc/src/main/java/org/jackhuang/hmcl/gradle/utils/PropertiesUtils.java

@@ -0,0 +1,39 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <[email protected]> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.gradle.utils;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+
+/// @author Glavo
+public final class PropertiesUtils {
+    public static @NotNull Properties load(Path path) throws IOException {
+        Properties properties = new Properties();
+        try (var reader = Files.newBufferedReader(path)) {
+            properties.load(reader);
+        }
+        return properties;
+    }
+
+    private PropertiesUtils() {
+    }
+}

config-jenkins.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-_HMCL_PROJECT_ROOT=$(dirname "${BASH_SOURCE[0]}")
-
-sed -i 's,//services.gradle.org/distributions/,//mirrors.cloud.tencent.com/gradle/,g' "$_HMCL_PROJECT_ROOT/gradle/wrapper/gradle-wrapper.properties"

config/jenkins/config-jenkins.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sed -i 's,//services.gradle.org/distributions/,//mirrors.cloud.tencent.com/gradle/,g' "$PWD/gradle/wrapper/gradle-wrapper.properties"
+

config/jenkins/dev/Jenkinsfile

@@ -0,0 +1,23 @@
+pipeline {
+    agent any
+
+    environment {
+        HMCL_CI = '1'
+
+        VERSION_TYPE = 'dev'
+        MICROSOFT_AUTH_ID = credentials('microsoft_auth_id')
+        MICROSOFT_AUTH_SECRET = credentials('microsoft_auth_secret')
+        CURSEFORGE_API_KEY = credentials('curseforge_api_key')
+        HMCL_SIGNATURE_KEY = credentials('hmcl_signature_key')
+    }
+
+    stages {
+        stage('Build') {
+            steps {
+                sh 'bash ./config/jenkins/config-jenkins.sh'
+                sh './gradlew clean makeExecutables --stacktrace --no-daemon'
+                archiveArtifacts artifacts: 'HMCL/build/libs/*'
+            }
+        }
+    }
+}

config/jenkins/stable/Jenkinsfile

@@ -0,0 +1,23 @@
+pipeline {
+    agent any
+
+    environment {
+        HMCL_CI = '1'
+
+        VERSION_TYPE = 'stable'
+        MICROSOFT_AUTH_ID = credentials('microsoft_auth_id')
+        MICROSOFT_AUTH_SECRET = credentials('microsoft_auth_secret')
+        CURSEFORGE_API_KEY = credentials('curseforge_api_key')
+        HMCL_SIGNATURE_KEY = credentials('hmcl_signature_key')
+    }
+
+    stages {
+        stage('Build') {
+            steps {
+                sh 'bash ./config/jenkins/config-jenkins.sh'
+                sh './gradlew clean makeExecutables --stacktrace --no-daemon'
+                archiveArtifacts artifacts: 'HMCL/build/libs/*'
+            }
+        }
+    }
+}

config/project.properties

@@ -0,0 +1,18 @@
+#
+# Hello Minecraft! Launcher
+# Copyright (C) 2025 huangyuhui <[email protected]> and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+versionRoot=3.6