diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index 92102e8..e1a0806 100644 --- a/.github/workflows/build_1_20_4_v2.yml +++ b/.github/workflows/build_1_20_4_v2.yml @@ -23,18 +23,18 @@ jobs: run: | git config --global user.email "ci@luminolmc.com" git config --global user.name "Luminol CI" - # - name: Apply Patches - # run: ./gradlew applyPatches - # - name: Build - # run: ./gradlew createReobfBundlerJar createReobfPaperclipJar - # - uses: "actions/upload-artifact@v3" - # with: - # name: "Luminol CI Artifacts" - # path: "build/libs/*.jar" - # - 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: Apply Patches + run: ./gradlew applyPatches + - name: Build + run: ./gradlew createReobfBundlerJar createReobfPaperclipJar + - uses: "actions/upload-artifact@v3" + with: + name: "Luminol CI Artifacts" + path: "build/libs/*.jar" + - 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: setenv run: | sh scripts/SetENV.sh diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index c178dd5..1543bfa 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -3,16 +3,11 @@ 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