From dbc3cbfc36733810b78bf099d852c0d139cb1e2f Mon Sep 17 00:00:00 2001
From: acrylic-style <me@acrylicstyle.xyz>
Date: Thu, 4 May 2023 11:27:08 +0900
Subject: [PATCH] feat: release mc + api version to github (without build
 number)

---
 .github/workflows/build.yml | 16 ++++++++++++++--
 build.gradle.kts            |  6 +++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 004b2c7..8862784 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
   # the problem is that the numbers are going to be masked because of the secrets
   get_major_version:
     runs-on: ubuntu-latest
-    name: "Get major version"
+    name: "Get version"
     steps:
       - uses: actions/checkout@v3
       - name: Get major version
@@ -89,11 +89,14 @@ jobs:
         run: './gradlew -PBUILD_NUMBER=$BUILD_NUMBER bakeInstaller --info --stacktrace'
         env:
           BUILD_NUMBER: ${{ secrets[format('BUILD_NUMBER_{0}', env.MAJOR_VERSION)] }}
-      - name: Retrieve version
+      - name: Retrieve mc + api + build number version
         run: 'echo "version=$(./gradlew -q --console plain -PBUILD_NUMBER=$BUILD_NUMBER printVersion)" >> $GITHUB_OUTPUT'
         id: retrieveVersion
         env:
           BUILD_NUMBER: ${{ secrets[format('BUILD_NUMBER_{0}', env.MAJOR_VERSION)] }}
+      - name: Retrieve mc + api version
+        run: 'echo "version=$(./gradlew -q --console plain printVersion)" >> $GITHUB_OUTPUT'
+        id: retrieveApiVersion
       - name: Release new build
         uses: softprops/action-gh-release@v1
         with:
@@ -103,6 +106,15 @@ jobs:
           fail_on_unmatched_files: true
           token: ${{ secrets.GITHUB_TOKEN }}
           prerelease: ${{ !startsWith(github.ref_name, 'ver/') && github.ref_name != 'main' && github.ref_name != 'master' }}
+      - name: Update release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.retrieveApiVersion.outputs.version }}
+          files: '*-installer.jar'
+          target_commitish: ${{ github.sha }}
+          fail_on_unmatched_files: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          prerelease: ${{ !startsWith(github.ref_name, 'ver/') && github.ref_name != 'main' && github.ref_name != 'master' }}
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v3.1.2
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
index 580837a..093de1f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,11 @@ tasks {
         group = "blueberry"
 
         doLast {
-            println("$MINECRAFT_VERSION-${API_VERSION.replace("-SNAPSHOT", "")}.${getBuildNumber(project)}")
+            if (project.properties["BUILD_NUMBER"].toString().toLongOrNull() != null) {
+                println("$MINECRAFT_VERSION-${API_VERSION.replace("-SNAPSHOT", "")}.${getBuildNumber(project)}")
+            } else {
+                println("$MINECRAFT_VERSION-${API_VERSION.replace("-SNAPSHOT", "")}")
+            }
         }
     }
 }