diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 5bfcf719..caf796ec 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -68,7 +68,9 @@ jobs: tag_name: ${{ steps.tagger.outputs.tag }} name: ${{ steps.tagger.outputs.tag }} generate_release_notes: true - files: app/build/outputs/apk/foss/beta/*.apk + files: | + app/build/outputs/apk/foss/beta/*.apk + app-wear/build/outputs/apk/foss/beta/*.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -80,7 +82,9 @@ jobs: tag_name: ${{ steps.tagger.outputs.tag }} name: ${{ steps.tagger.outputs.tag }} generate_release_notes: true - files: app/build/outputs/apk/foss/release/*.apk + files: | + app/build/outputs/apk/foss/release/*.apk + app-wear/build/outputs/apk/foss/release/*.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/app-wear/build.gradle.kts b/app-wear/build.gradle.kts index c30e32a2..9e2471d1 100644 --- a/app-wear/build.gradle.kts +++ b/app-wear/build.gradle.kts @@ -90,7 +90,7 @@ android { val variantName: String = variantOutputImpl.name if (listOf("release", "beta").any { variantName.toLowerCase().contains(it) }) { - val outputFileName = ProjectConfig.packageName + + val outputFileName = ProjectConfig.packageName + "-WEAROS" + "-v${defaultConfig.versionName}-${defaultConfig.versionCode}" + "-${variantName.toUpperCase()}-${lastCommitHash()}.apk" diff --git a/buildSrc/src/main/java/ProjectConfig.kt b/buildSrc/src/main/java/ProjectConfig.kt index ebbdf550..a255f1fc 100644 --- a/buildSrc/src/main/java/ProjectConfig.kt +++ b/buildSrc/src/main/java/ProjectConfig.kt @@ -17,7 +17,7 @@ object ProjectConfig { const val major = 2 const val minor = 0 const val patch = 0 - const val build = 0 + const val build = 1 const val name = "${major}.${minor}.${patch}-rc${build}" const val code = major * 1000000 + minor * 10000 + patch * 100 + build