andy describe

SachinVin · Aug 16, 2022 · 590302d · 590302d
1 parent 2cf77fa
commit 590302d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.ci/android/build.sh b/.ci/android/build.sh
@@ -9,7 +9,7 @@ ccache -s
 
 cd src/android
 chmod +x ./gradlew
-./gradlew bundle${BUILD_FLAVOR}Release
 ./gradlew assemble${BUILD_FLAVOR}Release
+./gradlew bundle${BUILD_FLAVOR}Release
 
 ccache -s
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -132,6 +132,7 @@ jobs:
           sudo apt-get install ccache -y
       - name: Build
         run: |
+          git describe --always
           ./.ci/android/build.sh
           git status
       - name: Copy artifacts

diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle
@@ -140,11 +140,17 @@ def getVersion() {
     def versionName = '0.0'
 
     try {
-        versionName = 'git describe --always'.execute([], project.rootDir).text
-                .trim()
+        versionName = 'git describe --always --long'.execute([], project.rootDir).text
+                    .trim()
+                    .replaceAll(/(-0)?-[^-]+$/, "")
     } catch (Exception) {
         logger.error('Cannot find git, defaulting to dummy version number')
     }
 
+    if (System.getenv("GITHUB_ACTIONS") != null) {
+        def gitTag = System.getenv("GIT_TAG_NAME")
+        versionName = gitTag ?: versionName
+    }
+
     return versionName
 }