From 3555532df0e19ea9ab5ee865fa4c7083edd15085 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Mon, 18 Mar 2024 16:13:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=BB=93=E9=BC=A0?= =?UTF-8?q?=E6=A0=B8=E5=BF=83=E8=87=AA=E5=8A=A8=E6=A3=80=E6=B5=8B=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ball-bukkit/src/main/resources/jenkins.yml | 6 ------ ball-bukkit/src/main/resources/update.yml | 6 ++++++ ball-bungee/src/main/resources/jenkins.yml | 6 ------ ball-bungee/src/main/resources/update.yml | 6 ++++++ ball-velocity/src/main/resources/jenkins.yml | 6 ------ ball-velocity/src/main/resources/update.yml | 6 ++++++ build.gradle.kts | 11 ++--------- 7 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 ball-bukkit/src/main/resources/jenkins.yml create mode 100644 ball-bukkit/src/main/resources/update.yml delete mode 100644 ball-bungee/src/main/resources/jenkins.yml create mode 100644 ball-bungee/src/main/resources/update.yml delete mode 100644 ball-velocity/src/main/resources/jenkins.yml create mode 100644 ball-velocity/src/main/resources/update.yml diff --git a/ball-bukkit/src/main/resources/jenkins.yml b/ball-bukkit/src/main/resources/jenkins.yml deleted file mode 100644 index f368a8b..0000000 --- a/ball-bukkit/src/main/resources/jenkins.yml +++ /dev/null @@ -1,6 +0,0 @@ -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/ball-bukkit/src/main/resources/update.yml b/ball-bukkit/src/main/resources/update.yml new file mode 100644 index 0000000..2ccf96c --- /dev/null +++ b/ball-bukkit/src/main/resources/update.yml @@ -0,0 +1,6 @@ +version: ${version} +CHECK_TYPE: GITEA_RELEASES +GIT_BASE_URL: https://git.airgame.net +GIT_REPO: MiniDay/hamster-ball +GIT_TOKEN: a44a69a4d1b8601bf6091403247759cd28764d5e +DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/ diff --git a/ball-bungee/src/main/resources/jenkins.yml b/ball-bungee/src/main/resources/jenkins.yml deleted file mode 100644 index f368a8b..0000000 --- a/ball-bungee/src/main/resources/jenkins.yml +++ /dev/null @@ -1,6 +0,0 @@ -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/ball-bungee/src/main/resources/update.yml b/ball-bungee/src/main/resources/update.yml new file mode 100644 index 0000000..2ccf96c --- /dev/null +++ b/ball-bungee/src/main/resources/update.yml @@ -0,0 +1,6 @@ +version: ${version} +CHECK_TYPE: GITEA_RELEASES +GIT_BASE_URL: https://git.airgame.net +GIT_REPO: MiniDay/hamster-ball +GIT_TOKEN: a44a69a4d1b8601bf6091403247759cd28764d5e +DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/ diff --git a/ball-velocity/src/main/resources/jenkins.yml b/ball-velocity/src/main/resources/jenkins.yml deleted file mode 100644 index f368a8b..0000000 --- a/ball-velocity/src/main/resources/jenkins.yml +++ /dev/null @@ -1,6 +0,0 @@ -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/ball-velocity/src/main/resources/update.yml b/ball-velocity/src/main/resources/update.yml new file mode 100644 index 0000000..2ccf96c --- /dev/null +++ b/ball-velocity/src/main/resources/update.yml @@ -0,0 +1,6 @@ +version: ${version} +CHECK_TYPE: GITEA_RELEASES +GIT_BASE_URL: https://git.airgame.net +GIT_REPO: MiniDay/hamster-ball +GIT_TOKEN: a44a69a4d1b8601bf6091403247759cd28764d5e +DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/ diff --git a/build.gradle.kts b/build.gradle.kts index c49c2a1..ada99ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,15 +44,8 @@ subprojects { duplicatesStrategy = DuplicatesStrategy.EXCLUDE } processResources { - val map = mutableMapOf() - 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) + filesMatching("update.yml") { + expand(rootProject.properties) } } build {