Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4

update ci
fix ci*2
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 6 additions and 5 deletions
--- a/.github/workflows/build_1_20_4_v2.yml
+++ b/.github/workflows/build_1_20_4_v2.yml
@@ -29,9 +29,9 @@ jobs:
      - name: Configure Git User Details
        run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
      - name: Apply Patches
-        run: gradle applyPatches
+        run: gradle applyPatches --scan
      - name: CreateJar
-        run: gradle createReobfBundlerJar createReobfPaperclipJar
+        run: gradle createReobfBundlerJar createReobfPaperclipJar --scan
      - name: SetENV
        run: |
          sh scripts/SetENV.sh
--- 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
@@ -13,6 +13,7 @@ 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 master ^`git describe --tags --abbrev=0` | wc -l)

 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
Author	SHA1	Message	Date
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