use build number and version from github

lhns · Nov 26, 2021 · de4ef8f · de4ef8f
1 parent 90870cd
commit de4ef8f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,6 +24,8 @@ jobs:
           [ "${{ secrets.RELEASE_STORE_BASE64}}" == "" ] || echo "${{ secrets.RELEASE_STORE_BASE64}}" | base64 -d > keystore.jks
       - name: Build with Gradle
         env:
+          CI_VERSION: ${{ github.ref }}
+          CI_BUILD_NUMBER: ${{ github.run_id }}
           RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }}
           RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
           RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,6 +19,8 @@ jobs:
         run: echo "${{ secrets.RELEASE_STORE_BASE64}}" | base64 -d > keystore.jks
       - name: Build with Gradle
         env:
+          CI_VERSION: ${{ github.ref }}
+          CI_BUILD_NUMBER: ${{ github.run_id }}
           RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }}
           RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
           RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}

diff --git a/app/build.gradle b/app/build.gradle
@@ -4,15 +4,25 @@ plugins {
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.0'
 }
 
+def getBuildNumber = { ->
+    System.getenv('CI_BUILD_NUMBER')?.toInteger() ?: 1
+}
+
+def getVersion = { ->
+    def matcher = System.getenv('CI_VERSION') =~ /refs\/tags\/(.*)/
+    if (matcher.find()) matcher.group(1)
+    else "0.0.1-SNAPSHOT"
+}
+
 android {
     compileSdkVersion 30
 
     defaultConfig {
         applicationId "de.lolhens.resticui"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode getBuildNumber()
+        versionName getVersion()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }