From a9a57793651e90696d55ef874f8a127c40f1944d Mon Sep 17 00:00:00 2001 From: Klop233 <3337913379@qq.com> Date: Sun, 14 Apr 2024 09:51:01 +0800 Subject: [PATCH] fix ci*2 Add Gradle Scan update ci [ci skip] update CI --- .github/workflows/build_1_20_4_v2.yml | 4 ++-- gradle.properties | 6 +++--- scripts/SetENV.sh | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index 725341c..7125444 100644 --- 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 diff --git a/gradle.properties b/gradle.properties index 0f0605d..2f3bc12 100644 --- 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 \ No newline at end of file +mcVersion = 1.20.4 +GroupMCV = 1.20 +preVersion = false \ No newline at end of file diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index f94e852..09d428c 100644 --- 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