Merge branch 'dev/26.1.2' of https://github.com/LuminolMC/Lophine into dev/26.1.2

.github/workflows/build.yml

@@ -10,11 +10,11 @@ on:
   workflow_dispatch:
     inputs:
       force-release:
-        description: "Force disable release if you enter 2, force release if you enter 1, default release if not released else skip release"
+        description: "Force disable release if you enter false, force release if you enter true, default release if not released else skip release"
         required: false
         default: ""
       force-push:
-        description: "Force disable push to repo if you enter 2, force push to repo if you enter 1, default push if not released else skip push repo"
+        description: "Force disable push to repo if you enter false, force push to repo if you enter true, default push if not released else skip push repo"
         required: false
         default: ""
       comments:
@@ -99,7 +99,7 @@ jobs:
           fi
 
       - name: Publish To Repo
-        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_release == 'true' && env.release_exists != 'true' && !( inputs.force-release == '2' )) || inputs.force-push == '1'
+        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_push_repo == 'true' && !( inputs.force-push == 'false' )) || inputs.force-push == 'true'
         continue-on-error: true
         run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true
         env:
@@ -107,7 +107,7 @@ jobs:
           PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}
 
       - name: Create Release - Pre Process
-        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_release == 'true' && env.release_exists != 'true' && !(inputs.force-release == '2')) || inputs.force-release == '1'
+        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_release == 'true' && env.release_exists != 'true' && !(inputs.force-release == 'false')) || inputs.force-release == 'true'
         run: |
           if [ "${{ inputs.comments }}" == "" ]; then
             echo "No comments provided"

gradle.properties

@@ -4,8 +4,10 @@ apiVersion=26.1.2
 channel=BETA
 clipVersion=3.0.17
 weightVersion=2.0.12
-# 0 for skip release, 1 for pre-release, 2 for release
-release=0
+# true for release, false for skip release, pre for pre-release
+release=pre
+# true for push to repo, false for skip push repo, auto for detect by release value
+pushRepo=auto
 
 luminolRef=397a754b718e76edbe1a9d6d583054f885db5fde
 

scripts/SetENV.sh

@@ -8,20 +8,30 @@ project_id_b="Lophine"
 commitid=$(git log --pretty='%h' -1)
 mcversion=$(prop mcVersion)
 release=$(prop release)
+pushRepo=$(prop pushRepo)
 release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="lophine-server/build/libs/$jarName"
 
+flag_push_repo=false
 flag_release=false
 pre=false
 
-if [ "$release" = "1" ]; then
+if [ "$release" = "pre" ]; then
   pre=true
   flag_release=true
   make_latest=true
-elif [ "$release" = "2" ]; then
+  flag_push_repo=true
+elif [ "$release" = "true" ]; then
   flag_release=true
   make_latest=true
+  flag_push_repo=true
+fi
+
+if [ "$pushRepo" = "true" ]; then
+  flag_push_repo=true
+elif [ "$pushRepo" = "false" ]; then
+  flag_push_repo=false
 fi
 
 actual_jar=$(ls lophine-server/build/libs/$project_id-paperclip-*.jar 2>/dev/null | head -n 1)
@@ -40,5 +50,6 @@ echo "pre=$pre" >> $GITHUB_ENV
 echo "tag=$release_tag" >> $GITHUB_ENV
 echo "jar=$jarName" >> $GITHUB_ENV
 echo "jar_dir=$jarName_dir" >> $GITHUB_ENV
+echo "flag_push_repo=$flag_push_repo" >> $GITHUB_ENV
 echo "flag_release=$flag_release" >> $GITHUB_ENV
 echo "make_latest=$make_latest" >> $GITHUB_ENV