From 401fb60cea7f4543aad8193da9ff1f2cf45d55ef Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Sat, 16 Mar 2024 21:52:54 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20Jenkins=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=86=99=E5=85=A5=E6=96=87=E4=BB=B6=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                           | 18 +++++++-----------
 core-bukkit/build.gradle.kts               |  5 +++++
 core-bukkit/src/main/resources/jenkins.yml |  6 ++++++
 core-bukkit/src/main/resources/plugin.yml  |  8 --------
 core-bungee/src/main/resources/bungee.yml  |  8 --------
 core-bungee/src/main/resources/jenkins.yml |  6 ++++++
 6 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 core-bukkit/src/main/resources/jenkins.yml
 create mode 100644 core-bungee/src/main/resources/jenkins.yml

diff --git a/build.gradle.kts b/build.gradle.kts
index 7d09bff..d0844ba 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,17 +45,13 @@ subprojects {
         }
         processResources {
             val map = mutableMapOf<String, String>()
-            map.putAll(System.getenv())
-            map["BUILD_ID"] = System.getenv().getOrDefault("BUILD_ID", "")
-            map["BUILD_NUMBER"] = System.getenv().getOrDefault("BUILD_NUMBER", "")
-            map["BUILD_DISPLAY_NAME"] = System.getenv().getOrDefault("BUILD_DISPLAY_NAME", "")
-            map["JOB_URL"] = System.getenv().getOrDefault("JOB_URL", "")
-            map["BUILD_URL"] = System.getenv().getOrDefault("BUILD_URL", "")
-            map["GIT_COMMIT"] = System.getenv().getOrDefault("GIT_COMMIT", "")
-            rootProject.properties.forEach { (k, v) ->
-                map[k] = v.toString()
-            }
-            filesMatching(listOf("plugin.yml", "bungee.yml")) {
+            map["BUILD_ID"] = System.getenv().getOrDefault("BUILD_ID", "NONE")
+            map["BUILD_NUMBER"] = System.getenv().getOrDefault("BUILD_NUMBER", "NONE")
+            map["BUILD_DISPLAY_NAME"] = System.getenv().getOrDefault("BUILD_DISPLAY_NAME", "NONE")
+            map["JOB_URL"] = System.getenv().getOrDefault("JOB_URL", "NONE")
+            map["BUILD_URL"] = System.getenv().getOrDefault("BUILD_URL", "NONE")
+            map["GIT_COMMIT"] = System.getenv().getOrDefault("GIT_COMMIT", "NONE")
+            filesMatching("jenkins.yml") {
                 expand(map)
             }
         }
diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts
index dc72e5d..0fb84b3 100644
--- a/core-bukkit/build.gradle.kts
+++ b/core-bukkit/build.gradle.kts
@@ -30,6 +30,11 @@ dependencies {
 }
 
 tasks {
+    processResources {
+        filesMatching("plugin.yml") {
+            expand(project.properties)
+        }
+    }
     withType<Jar> {
         archiveBaseName = "HamsterCore-Bukkit"
     }
diff --git a/core-bukkit/src/main/resources/jenkins.yml b/core-bukkit/src/main/resources/jenkins.yml
new file mode 100644
index 0000000..f368a8b
--- /dev/null
+++ b/core-bukkit/src/main/resources/jenkins.yml
@@ -0,0 +1,6 @@
+BUILD_ID: ${BUILD_ID}
+BUILD_NUMBER: ${BUILD_NUMBER}
+BUILD_DISPLAY_NAME: ${BUILD_DISPLAY_NAME}
+JOB_URL: ${JOB_URL}
+BUILD_URL: ${BUILD_URL}
+GIT_COMMIT: ${GIT_COMMIT}
\ No newline at end of file
diff --git a/core-bukkit/src/main/resources/plugin.yml b/core-bukkit/src/main/resources/plugin.yml
index 2b70cbb..8bbfad8 100644
--- a/core-bukkit/src/main/resources/plugin.yml
+++ b/core-bukkit/src/main/resources/plugin.yml
@@ -7,14 +7,6 @@ author: MiniDay
 website: https://git.airgame.net/MiniDay/hamster-core
 description: 仓鼠核心：叁只仓鼠的 Minecraft 插件开发通用工具包
 
-jenkins:
-  BUILD_ID: ${BUILD_ID}
-  BUILD_NUMBER: ${BUILD_NUMBER}
-  BUILD_DISPLAY_NAME: ${BUILD_DISPLAY_NAME}
-  JOB_URL: ${JOB_URL}
-  BUILD_URL: ${BUILD_URL}
-  GIT_COMMIT: ${GIT_COMMIT}
-
 load: STARTUP
 
 softdepend:
diff --git a/core-bungee/src/main/resources/bungee.yml b/core-bungee/src/main/resources/bungee.yml
index f7a091b..b321c81 100644
--- a/core-bungee/src/main/resources/bungee.yml
+++ b/core-bungee/src/main/resources/bungee.yml
@@ -4,11 +4,3 @@ version: ${version}
 
 author: MiniDay
 description: 仓鼠核心：叁只仓鼠的 Minecraft 插件开发通用工具包
-
-jenkins:
-  BUILD_ID: ${BUILD_ID}
-  BUILD_NUMBER: ${BUILD_NUMBER}
-  BUILD_DISPLAY_NAME: ${BUILD_DISPLAY_NAME}
-  JOB_URL: ${JOB_URL}
-  BUILD_URL: ${BUILD_URL}
-  GIT_COMMIT: ${GIT_COMMIT}
diff --git a/core-bungee/src/main/resources/jenkins.yml b/core-bungee/src/main/resources/jenkins.yml
new file mode 100644
index 0000000..f368a8b
--- /dev/null
+++ b/core-bungee/src/main/resources/jenkins.yml
@@ -0,0 +1,6 @@
+BUILD_ID: ${BUILD_ID}
+BUILD_NUMBER: ${BUILD_NUMBER}
+BUILD_DISPLAY_NAME: ${BUILD_DISPLAY_NAME}
+JOB_URL: ${JOB_URL}
+BUILD_URL: ${BUILD_URL}
+GIT_COMMIT: ${GIT_COMMIT}
\ No newline at end of file