From ffbe683e86811215cd4c10636a58f970786ced04 Mon Sep 17 00:00:00 2001
From: Wagyourtail <wagyourtail@wagyourtail.xyz>
Date: Fri, 3 Jun 2022 14:24:17 -0600
Subject: [PATCH] versioning with normal build

---
 .github/workflows/gradle_build.yml | 4 ++--
 build.gradle                       | 8 +++++++-
 gradle.properties                  | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
index 0af2ebbc1..9c28df452 100644
--- a/.github/workflows/gradle_build.yml
+++ b/.github/workflows/gradle_build.yml
@@ -24,8 +24,8 @@ jobs:
       run: chmod +x gradlew
       
     - name: Build with Gradle
-      run: ./gradlew build -Pmod_version=$(git describe --always --tags | cut -c2-)
-      
+      run: ./gradlew build
+
     - name: Archive Artifacts
       uses: actions/upload-artifact@v2
       with:
diff --git a/build.gradle b/build.gradle
index ad9c3335b..29657d789 100755
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,13 @@
  */
 
 group 'baritone'
-version project.mod_version
+
+def vers = 'git describe --always --tags --dirty'.execute().text.trim();
+if (!vers.startsWith("v")) {
+    version project.hasProperty("mod_version") + "+" + "local_build";
+} else {
+    version vers.substring(1)
+}
 
 buildscript {
     repositories {
diff --git a/gradle.properties b/gradle.properties
index dfce2934c..ca675d85d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,4 @@
 # along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-mod_version = 1.2.15-local_build
\ No newline at end of file
+mod_version = 1.2.15
\ No newline at end of file