From ed381d6b33879e68d775d1e724f7321f1307ace3 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Fri, 3 Jun 2022 14:29:51 -0600 Subject: [PATCH] fix CI not having access to git when run via gradle --- .github/workflows/gradle_build.yml | 2 +- build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 9c28df452..70498991a 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -24,7 +24,7 @@ jobs: run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build -Pmod_version=$(git describe --always --tags | cut -c2-) - name: Archive Artifacts uses: actions/upload-artifact@v2 diff --git a/build.gradle b/build.gradle index 3fc738c9e..5c0fbf146 100755 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ group 'baritone' def vers = 'git describe --always --tags --dirty'.execute().text.trim(); if (!vers.startsWith("v")) { - version project.mod_version + "+" + "local_build"; + version project.mod_version; } else { version vers.substring(1) } diff --git a/gradle.properties b/gradle.properties index ca675d85d..9242d089a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ # along with Baritone. If not, see . # -mod_version = 1.2.15 \ No newline at end of file +mod_version = 1.2.15-local \ No newline at end of file