diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index 0d45a57..7125444 100644 --- a/.github/workflows/build_1_20_4_v2.yml +++ b/.github/workflows/build_1_20_4_v2.yml @@ -5,60 +5,64 @@ on: branches: [ "ver/1.20.4" ] pull_request: branches: [ "ver/1.20.4" ] - # workflow_dispatch: + permissions: write-all + jobs: build: runs-on: ubuntu-latest environment: default - steps: - name: Checkout Git Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 + - name: Validate Gradle wrapper + uses: gradle/actions/wrapper-validation@v3 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 8.4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' - - name: Setup Git Config - run: | - git config --global user.email "ci@luminolmc.com" - git config --global user.name "Luminol CI" + - 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: ./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: gradle applyPatches --scan + - name: CreateJar + run: gradle createReobfBundlerJar createReobfPaperclipJar --scan + - name: SetENV run: | sh scripts/SetENV.sh echo "${{ env.tag }}" + - name: Upload Artifact + uses: "actions/upload-artifact@v4" + with: + name: "${{ env.project_id_b }} CI Artifacts" + path: "build/libs/*.jar" - name: Create Release - if: "!contains(github.event.commits[0].message, '[release-skip]')" - uses: ncipollo/release-action@v1.12.0 + if: "!contains(github.event.commits[0].message, '[release skip]')" + uses: ncipollo/release-action@v1.14.0 with: tag: ${{ env.tag }} - name: Luminol ${{ env.mcversion }} - ${{ env.commitid }} + name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }} body: | - 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commitid }} [![download](https://img.shields.io/github/downloads/LuminolMC/Luminol/${{ env.tag }}/total?color=0)](https://github.com/LeavesMC/LuminolMC/Luminol/download/${{ env.tag }}/luminol-1.20.4-paperclip.jar) + 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=0)](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: | - build/libs/luminol-1.20.4-bundler.jar - build/libs/luminol-1.20.4-paperclip.jar + ${{ env.jar_dir }} + build/libs/${{ env.project_id }}-${{ env.mcversion }}-bundler.jar generateReleaseNotes: true prerelease: ${{ env.pre }} makeLatest: ${{ env.make_latest }} token: "${{ secrets.GITHUB_TOKEN }}" - - name: Push to Api - if: "!contains(github.event.commits[0].message, '[release-skip]')" + - name: Push to API + if: "!contains(github.event.commits[0].message, '[release skip]')" env: secret_v2: ${{ secrets.API_KEY }} tag: ${{ env.tag }} - run: sh scripts/PushToAPI.sh + project_id: ${{ env.project_id }} + run: sh scripts/PushToAPI.sh \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0dffdfc..2f3bc12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,6 @@ org.gradle.parallel = true org.gradle.vfs.watch = false org.gradle.jvmargs = -Xmx3G -mcVersion=1.20.4 -GroupMCV=1.20 -preVersion=false \ No newline at end of file +mcVersion = 1.20.4 +GroupMCV = 1.20 +preVersion = false \ No newline at end of file diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index 88f4caa..bc46560 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -8,6 +8,7 @@ preVersion=$(prop preVersion) release_tag="$mcversion-$commitid" jarName="build/libs/luminol-1.20.4-paperclip.jar" make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") +number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l) echo "commitid=$commitid" >> $GITHUB_ENV echo "mcversion=$mcversion" >> $GITHUB_ENV