diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index 29dc893..92102e8 100644 --- a/.github/workflows/build_1_20_4_v2.yml +++ b/.github/workflows/build_1_20_4_v2.yml @@ -37,7 +37,7 @@ jobs: # mv build/libs/luminol-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-paperclip.jar - name: setenv run: | - sh scripts/setenv.sh + sh scripts/SetENV.sh echo "${{ env.tag }}" - name: Create Release if: "!contains(github.event.commits[0].message, '[release-skip]')" diff --git a/gradle.properties b/gradle.properties index 91a003e..c2118ea 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_Group=1.20 mcVersion=1.20.4 +mcVersionGroup=1.20 preVersion=false \ No newline at end of file diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index 56cc33f..aef7313 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -7,7 +7,7 @@ prop() { } echo "$tag" project_id="luminol" -mcversion_group=$(prop mcVersion_Group) +mcversion_group=$(prop mcVersionGroup) mcversion=$(prop mcVersion) echo "$mcversion_group - $mcversion" pre=$(prop preVersion) diff --git a/scripts/setenv.sh b/scripts/setenv.sh index 1543bfa..c178dd5 100644 --- a/scripts/setenv.sh +++ b/scripts/setenv.sh @@ -3,11 +3,16 @@ prop() { } commitid=$(git log --pretty='%h' -1) +echo "$commitid" mcversion=$(prop mcVersion) +echo "$mcversion" preVersion=$(prop preVersion) +echo "$preVersion" release_tag="$mcversion-$commitid" +echo "$release_tag" jarName="build/libs/luminol-1.20.4-paperclip.jar" make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") +echo "$make_latest" echo "commitid=$commitid" >> $GITHUB_ENV echo "mcversion=$mcversion" >> $GITHUB_ENV