diff --git a/.github/workflows/build_1.20.4.yml b/.github/workflows/build_1.20.6.yml similarity index 72% rename from .github/workflows/build_1.20.4.yml rename to .github/workflows/build_1.20.6.yml index 3c371de..70d1944 100644 --- a/.github/workflows/build_1.20.4.yml +++ b/.github/workflows/build_1.20.6.yml @@ -1,10 +1,10 @@ -name: LightingLuminol CI - ver/1.20.4 +name: LightingLuminol CI - dev/1.20.6 on: push: - branches: [ "ver/1.20.4" ] + branches: [ "dev/1.20.6" ] pull_request: - branches: [ "ver/1.20.4" ] + branches: [ "dev/1.20.6" ] permissions: write-all @@ -20,18 +20,18 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: - gradle-version: 8.4 + gradle-version: 8.7 - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '17' + distribution: 'zulu' + java-version: '21' - name: Configure Git User Details run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI" - name: Apply Patches run: gradle applyPatches - name: CreateJar - run: gradle createReobfBundlerJar createReobfPaperclipJar + run: gradle createMojmapBundlerJar createMojmapPaperclipJar - name: SetENV run: sh scripts/SetENV.sh - name: Upload Artifact @@ -46,13 +46,18 @@ jobs: tag: ${{ env.tag }} name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }} body: | - 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=0&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/download/${{ env.tag }}/${{ env.jar }}) + > [!CAUTION] + > 🚨You are trying to download experimental builds! + > **DO NOT** use these builds in production, as there may be many bugs and corruption issues. + > Please report any and all issues you encounter! + + 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/download/${{ env.tag }}/${{ env.jar }}) This release is automatically compiled by GitHub Actions ### Commit Message ${{ env.commit_msg }} artifacts: | ${{ env.jar_dir }} - build/libs/${{ env.project_id }}-${{ env.mcversion }}-bundler.jar + ${{ env.jar_dir_bundler }} generateReleaseNotes: true prerelease: ${{ env.pre }} makeLatest: ${{ env.make_latest }} diff --git a/gradle.properties b/gradle.properties index 97db233..c3150b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ org.gradle.jvmargs = -Xmx3G mcVersion = 1.20.6 GroupMCV = 1.20 -preVersion = false +preVersion = true diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index c24018b..d0f036c 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -11,11 +11,13 @@ grdversion=$(prop version) preVersion=$(prop preVersion) release_tag="$mcversion-$commitid" jarName="$project_id-$mcversion-paperclip.jar" +jarName_bundler="$project_id-$mcversion-bundler.jar" jarName_dir="build/libs/$jarName" +jarName_bundler_dir="build/libs/$jarName_bundler" make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") -mv build/libs/$project_id_b-paperclip-$grdversion-reobf.jar build/libs/$jarName -mv build/libs/$project_id_b-bundler-$grdversion-reobf.jar build/libs/$project_id-$mcversion-bundler.jar +mv build/libs/$project_id-paperclip-$grdversion-mojmap.jar $jarName_dir +mv build/libs/$project_id-bundler-$grdversion-mojmap.jar $jarName_bundler_dir echo "project_id=$project_id" >> $GITHUB_ENV echo "project_id_b=$project_id_b" >> $GITHUB_ENV @@ -26,4 +28,5 @@ echo "pre=$preVersion" >> $GITHUB_ENV echo "tag=$release_tag" >> $GITHUB_ENV echo "jar=$jarName" >> $GITHUB_ENV echo "jar_dir=$jarName_dir" >> $GITHUB_ENV +echo "jar_dir_bundler=$jarName_bundler_dir" >> $GITHUB_ENV echo "make_latest=$make_latest" >> $GITHUB_ENV \ No newline at end of file