fix ci

Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4
update ci
2024-04-14 11:57:25 +08:00 · 2024-04-14 11:46:18 +08:00 · 2024-04-14 11:43:03 +08:00 · 2024-04-14 11:20:00 +08:00 · 2024-04-14 11:07:26 +08:00
2 changed files with 6 additions and 7 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,6 +8,6 @@ org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G

-mcVersion=1.20.4
-GroupMCV=1.20
-preVersion=false
+mcVersion = 1.20.4
+GroupMCV = 1.20
+preVersion = false
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -1,5 +1,5 @@
 prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+  grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }

 project_id="luminol"
@@ -13,13 +13,12 @@ release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="build/libs/$jarName"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
+number=$(git log --oneline ver/1.20.4 ^`git describe --tags --abbrev=0` | wc -l)

-ls build/libs
-echo "build/libs/$project_id-paperclip-$grdversion-reobf.jar >> build/libs/$jarName"
-echo "build/libs/$project_id-bundler-$grdversion-reobf.jar >> build/libs/$project_id-$mcversion-bundler.jar"
 mv build/libs/$project_id-paperclip-$grdversion-reobf.jar build/libs/$jarName
 mv build/libs/$project_id-bundler-$grdversion-reobf.jar build/libs/$project_id-$mcversion-bundler.jar

+
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
 echo "commit_id=$commitid" >> $GITHUB_ENV
Author	SHA1	Message	Date
ShintoKosei	3b4cdf6550	fix ci	2024-04-14 11:57:25 +08:00
ShintoKosei	c4e3e652fa	Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4	2024-04-14 11:46:18 +08:00
Klop233	64b64ace2b	update ci	2024-04-14 11:43:03 +08:00
Klop233	a9a5779365	fix ci*2 Add Gradle Scan update ci [ci skip] update CI	2024-04-14 11:20:00 +08:00
ShintoKosei	3250c80efa	update ci	2024-04-14 11:07:26 +08:00