From 3b4cdf6550a6ccc0cc106ef5d692f143e50f8ea8 Mon Sep 17 00:00:00 2001 From: ShintoKosei <2081384668@qq.com> Date: Sun, 14 Apr 2024 11:57:25 +0800 Subject: [PATCH] fix ci --- .github/workflows/build_1_20_4_v2.yml | 4 ++-- scripts/SetENV.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index 7125444..725341c 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 --scan + run: gradle applyPatches - name: CreateJar - run: gradle createReobfBundlerJar createReobfPaperclipJar --scan + run: gradle createReobfBundlerJar createReobfPaperclipJar - name: SetENV run: | sh scripts/SetENV.sh diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index 09d428c..83e7efc 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -13,7 +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) +number=$(git log --oneline ver/1.20.4 ^`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