fix ci

Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4
2024-04-14 12:11:05 +08:00 · 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
3 changed files with 5 additions and 5 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/PushToAPI.sh
+++ b/scripts/PushToAPI.sh
@@ -2,7 +2,7 @@ sha256() {
  sha256sum $1 | awk '{print $1}'
 }
 prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+  grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }

 mcversion_group=$(prop GroupMCV)
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -21,7 +21,7 @@ mv build/libs/$project_id-bundler-$grdversion-reobf.jar build/libs/$project_id-$
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
 echo "commit_id=$commitid" >> $GITHUB_ENV
-echo "commit_msg=$(git log --pretty='> [%h] %s' -$number)" >> $GITHUB_ENV
+echo "commit_msg=$(git log --pretty='> [%h] %s' -1)" >> $GITHUB_ENV
 echo "$commit_msg"
 echo "mcversion=$mcversion" >> $GITHUB_ENV
 echo "pre=$preVersion" >> $GITHUB_ENV
Author	SHA1	Message	Date
ShintoKosei	b8fcfd2321	fix ci	2024-04-14 12:11:05 +08:00
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