feat(build): setup builds from develop

axiel7 · Aug 11, 2024 · 1b19b82 · 1b19b82
1 parent 87e532d
commit 1b19b82
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -1,9 +1,12 @@
 name: Android Build APK
 
+env:
+  BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
+
 on:
   push:
-    tags:
-      - '*'
+    paths:
+      - 'version.properties'
   workflow_dispatch:
     inputs:
       single_apk:
@@ -32,7 +35,7 @@ jobs:
           java-version: 17
           distribution: adopt
 
-      - if: ${{ inputs.single_apk == true }}
+      - if: ${{ inputs.single_apk == true || $BRANCH_NAME == 'develop' }}
         run: sed -i -e '/isEnable/s/true/false/' app/build.gradle.kts
 
       - name: Set MAL Client ID

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,8 +8,12 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
-val properties = Properties()
-properties.load(project.rootProject.file("private.properties").reader())
+val properties = Properties().also {
+    it.load(project.rootProject.file("private.properties").reader())
+}
+val versionProps = Properties().also {
+    it.load(project.rootProject.file("version.properties").reader())
+}
 
 android {
     compileSdk = 35
@@ -18,8 +22,8 @@ android {
         applicationId = "com.axiel7.moelist"
         minSdk = 23
         targetSdk = 35
-        versionCode = 146
-        versionName = "3.7.1"
+        versionCode = versionProps.getProperty("code").toInt()
+        versionName = versionProps.getProperty("name")
         setProperty("archivesBaseName", "moelist-v$versionName")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/version.properties b/version.properties
@@ -0,0 +1,2 @@
+code = 146
+name = 3.7.1