change: Update version string

.github/workflows/publish.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   build:
+    if: github.repository_owner == 'FlashyReese'
     runs-on: self-hosted
     steps:
       - name: Checkout Repository
@@ -20,11 +21,10 @@ jobs:
           java-version: 21
           check-latest: true
       - name: Upload assets to releases
-        run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository
+        run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository -Pbuild.release
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          BUILD_RELEASE: ${{ github.event.prerelease == false }}
       - name: Publish to Modrinth & CurseForge
         uses: Kir-Antipov/[email protected]
         with:

.github/workflows/self-hosted.yml

@@ -4,6 +4,7 @@ on: [ push ]
 
 jobs:
   build:
+    if: github.repository_owner == 'FlashyReese'
     runs-on: self-hosted
 
     steps:
@@ -17,8 +18,11 @@ jobs:
           distribution: 'temurin'
           java-version: 21
           check-latest: true
-      - name: Build with Gradle
-        run: ./gradlew build
+      - name: Build and Publish with Gradle
+        run: ./gradlew build publishAllPublicationsToFlashyReeseSnapshotsRepository
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
       - name: Upload Auild Artifacts
         uses: actions/upload-artifact@v4
         with:

build.gradle

@@ -1,5 +1,4 @@
 plugins {
-    id 'org.ajoberstar.grgit' version '5.2.1'
     id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'maven-publish'
     id 'signing'
@@ -9,7 +8,7 @@ sourceCompatibility = JavaVersion.VERSION_21
 targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
-version = "${project.mod_version}${getVersionType(project.version_type, project.revision)}+mc${project.minecraft_version}-${getVersionMetadata()}"
+version = createVersionString()
 group = project.maven_group
 
 repositories {
@@ -94,35 +93,28 @@ publishing {
     }
 }
 
-def getVersionMetadata() {
-    def build_id = System.getenv("GITHUB_RUN_NUMBER")
+def createVersionString() {
+    def builder = new StringBuilder()
 
-    // CI builds only
-    if (build_id != null) {
-        return "build.${build_id}"
+    def isReleaseBuild = project.hasProperty("build.release")
+    def buildId = System.getenv("GITHUB_RUN_NUMBER")
+
+    if (isReleaseBuild) {
+        builder.append(mod_version)
+    } else {
+        builder.append(mod_version.split('-')[0])
+        builder.append("-snapshot")
     }
 
-    if (grgit != null) {
-        def head = grgit.head()
-        def id = head.abbreviatedId
+    builder.append("+mc").append(minecraft_version)
 
-        // Flag the build if the build tree is not clean
-        if (!grgit.status().clean) {
-            id += "-dirty"
+    if (!isReleaseBuild) {
+        if (buildId != null) {
+            builder.append("-build.${buildId}")
+        } else {
+            builder.append("-local")
         }
-
-        return "rev.${id}"
     }
 
-    // No tracking information could be found about the build
-    return "unknown"
-}
-
-static def getVersionType(String version_type, String revision) {
-    version_type = version_type.trim().toLowerCase()
-    revision = revision.trim().toLowerCase()
-    if (version_type != "release") {
-        return "-${version_type}${revision}"
-    }
-    return ""
+    return builder.toString()
 }

gradle.properties

@@ -6,8 +6,6 @@ org.gradle.jvmargs=-Xmx1G
     yarn_mappings=1.20.5+build.1
     loader_version=0.15.10
 # Mod Properties
-    version_type=release
-    revision=1
     mod_version=1.7.2
     maven_group=me.flashyreese.mods
     archives_base_name=reeses_sodium_options