diff --git a/.github/workflows/build_1_20_4.yml b/.github/workflows/build_1_20_4.yml_no similarity index 95% rename from .github/workflows/build_1_20_4.yml rename to .github/workflows/build_1_20_4.yml_no index ea31b7c..577145a 100644 --- a/.github/workflows/build_1_20_4.yml +++ b/.github/workflows/build_1_20_4.yml_no @@ -8,10 +8,10 @@ name: LuminolCI - Ver/1.20.4 on: - # push: - # branches: [ "ver/1.20.4" ] - # pull_request: - # branches: [ "ver/1.20.4" ] + push: + branches: [ "ver/1.20.4" ] + pull_request: + branches: [ "ver/1.20.4" ] permissions: write-all diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index 0d103f1..56cfd27 100644 --- a/.github/workflows/build_1_20_4_v2.yml +++ b/.github/workflows/build_1_20_4_v2.yml @@ -31,27 +31,20 @@ jobs: with: name: "Luminol CI Artifacts" path: "build/libs/*.jar" - - name: Get version from asset - id: get_version - run: | - version=$(echo build/libs/*.jar | grep -oP 'bundler-\K\d+\.\d+\.\d+' | head -1) - echo "version=${version}" >> $GITHUB_ENV - echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - echo "tag=${{ env.version }}-${{ env.sha_short }}" >> $GITHUB_ENV - name: Rename jar file run: | mv build/libs/luminol-bundler-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-bundler.jar mv build/libs/luminol-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-paperclip.jar - - name: Get and Set ENV - run: sh scripts/GetSetENV.sh + - name: Set ENV + run: sh scripts/SetENV.sh - name: Create Release if: "!contains(github.event.commits[0].message, '[release-skip]')" uses: ncipollo/release-action@v1.12.0 with: tag: ${{ env.tag }} - name: Luminol ${{ env.version }} - ${{ env.sha_short }} + name: Luminol ${{ env.version }} - ${{ env.commitid }} body: | - 📦Version: `${{ env.version }}` | Commit ${{ env.sha_short }} [![download](https://img.shields.io/github/downloads/LuminolMC/Luminol/${{ env.tag }}/total?color=0&style=flat-square)](https://github.com/LeavesMC/LuminolMC/Luminol/download/${{ env.tag }}/luminol-1.20.4-paperclip.jar) + 📦Version: `${{ env.version }}` | Commit ${{ env.commitid }} [![download](https://img.shields.io/github/downloads/LuminolMC/Luminol/${{ env.tag }}/total?color=0&style=flat-square)](https://github.com/LeavesMC/LuminolMC/Luminol/download/${{ env.tag }}/luminol-1.20.4-paperclip.jar) This release is automatically compiled by GitHub Actions artifacts: | build/libs/luminol-1.20.4-bundler.jar diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index a6d22f5..4055fbc 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -7,7 +7,7 @@ prop() { } echo "$tag" project_id="luminol" -project_name="uminol" +project_name="luminol" mcversion=$(prop mcVersion) ctime=$(date -u +"%Y-%m-%dT%H:%M:%SZ") pre=$(prop preVersion) @@ -18,7 +18,7 @@ else fi promoted=false -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) changes=$(git log --pretty='%H<<<%s>>>' -"$number" | sed ':a;N;$!ba;s/\n//g') jar_name="build/libs/luminol-1.20.4-paperclip.jar" jar_sha256=`sha256 $jar_name` diff --git a/scripts/GetSetENV.sh b/scripts/SetENV.sh similarity index 85% rename from scripts/GetSetENV.sh rename to scripts/SetENV.sh index a4f639e..a70b90a 100644 --- a/scripts/GetSetENV.sh +++ b/scripts/SetENV.sh @@ -9,6 +9,8 @@ release_tag="$mcversion-$commitid" jarName="build/libs/luminol-1.20.4-paperclip.jar" make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") +echo "commitid=$commitid" >> $GITHUB_ENV +echo "version=$mcversion" >> $GITHUB_ENV echo "tag=$release_tag" >> $GITHUB_ENV echo "jar=$jarName" >> $GITHUB_ENV echo "pre=$preVersion" >> $GITHUB_ENV