diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 589f74a..0fe1fc0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,13 +10,13 @@ on: workflow_dispatch: inputs: force-release: - description: "Force release if you enter 1, default release if not released else skip release" + description: "Force disable release if you enter 0, force release if you enter 1, default release if not released else skip release" required: false - default: "0" + default: "" force-push: - description: "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 0, push to repo if you enter 1, default push if not released else skip push repo" required: false - default: "0" + default: "" comments: description: "Add comments to release" required: false @@ -50,7 +50,7 @@ jobs: - name: Apply All Patches run: ./gradlew --refresh-dependencies applyAllPatches - - name: CreateMojmapPaperclipJar + - name: Build Paperclip Jar run: ./gradlew --refresh-dependencies createMojmapPaperclipJar - name: Upload Artifact @@ -59,7 +59,7 @@ jobs: name: ${{ env.project_id_b }} CI Artifacts path: lophine-server/build/libs/*-paperclip-*-mojmap.jar - - name: SetENV + - name: Set Environment if: github.event_name != 'pull_request' run: sh scripts/SetENV.sh @@ -84,8 +84,8 @@ jobs: fi echo "release_exists=${release_exists}" >> $GITHUB_ENV - - name: Publish to repo - if: (( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' ) || ( env.release_exists == 'true' && inputs.force-push == '1' )) && false # do not push to any repo + - name: Publish To Repo + if: (( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' && inputs.force-push != '0' ) || inputs.force-push == '1') && false # do not push to any repo continue-on-error: true run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true env: @@ -93,7 +93,7 @@ jobs: PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }} - name: Create Release - Pre Process - if: ( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' ) || ( env.release_exists == 'true' && inputs.force-release == '1' ) + if: ( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' && inputs.force-release != '0' ) || inputs.force-release == '1' run: | if [ ${{ inputs.comments }} == "" ]; then echo "No comments provided" diff --git a/gradle.properties b/gradle.properties index e534abc..aed9097 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=69a48ce9b98318ea72d4a8f2f8720831f5554a5d +luminolRef=747ad851920a569d00857edea61c861c018ea684 org.gradle.configuration-cache=true org.gradle.caching=true