feat: Build and upload both Android OS and Wear OS apps

Gimbergsson · Jan 8, 2025 · 7853482 · 7853482
1 parent 0923bc3
commit 7853482
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 35 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - release/*
   workflow_dispatch:
-  
+
 jobs:
   apk:
     name: Generate release builds
@@ -18,7 +18,7 @@ jobs:
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-
-    
+
     - name: set up JDK 17
       uses: actions/setup-java@v4
       with:
@@ -35,17 +35,17 @@ jobs:
       run: |
         gem install bundler
         bundle install
-        
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-        
+
     - name: Generate apikey.properties
       run: |
           cat <<EOF > apikey.properties
           APPWRITE_PROJECT_ID:"${{ vars.APPWRITE_PROJECT_ID }}"
           APPWRITE_API_KEY:"${{ secrets.APPWRITE_API_KEY }}"
           EOF
-    
+
     - name: Generate keystore.properties
       run: |
           cat <<EOF > keystore.properties
@@ -54,7 +54,7 @@ jobs:
           KEYSTORE_KEY_ALIAS:${{ secrets.KEYSTORE_KEY_ALIAS }}
           KEYSTORE_FILE_PATH:${{ vars.KEYSTORE_FILE_PATH }}
           EOF
-    
+
     - name: Decode keystore and create jks
       run: |
         echo "${{ secrets.KEYSTORE_JKS_BASE64 }}" | base64 --decode > androidos/keystore.jks
@@ -63,14 +63,7 @@ jobs:
     - name: Decode and create service account json
       run: echo "${{ secrets.SERVICE_ACCOUNT_JSON_BASE64 }}" | base64 --decode > service-account-fehu-351916-1b4950fa3fb0.json
 
-    - name: Print file path
-      run: |
-        echo "The path of keystore.jks is:"
-        pwd
-        echo "Keystore Path: ${{ vars.KEYSTORE_FILE_PATH }}"
-        ls -la
-
-    - name: Set version codes from runner number
+    - name: Create version codes from runner number
       run: |
         #!/bin/bash
   
@@ -95,40 +88,34 @@ jobs:
       with:
         gradlePath: wearos/build.gradle.kts
         versionCode: ${{ env.WEAR_OS_VERSION_CODE }}
-    
+
     - name: Generate file name env var
       run: |
-          VERSION_NAME=$(${{ github.workspace }}/gradlew -q printBuildName)
-          MESSAGE=$(cat << EOF
-          tennis-scoreboard-${VERSION_NAME}
-          EOF)
-          echo OUTPUT_NAME=$MESSAGE >> $GITHUB_ENV
+        ANDROID_OS_VERSION_NAME=$(${{ github.workspace }}/gradlew -q androidos:printBuildName)
+        ANDROID_OS_NAME="tennis-scoreboard-androidos-${ANDROID_OS_VERSION_NAME}"
+        echo ANDROID_OS_FILE_NAME=$ANDROID_OS_NAME >> $GITHUB_ENV
+        WEAR_OS_VERSION_NAME=$(${{ github.workspace }}/gradlew -q wearos:printBuildName)
+        WEAR_OS_NAME="tennis-scoreboard-wearos-${WEAR_OS_VERSION_NAME}"
+        echo WEAR_OS_FILE_NAME=$WEAR_OS_NAME >> $GITHUB_ENV
 
-    - name: Build Android OS and Wear OS release AABs
+    - name: Build release AAB artifacts
       run: bash ./gradlew bundleRelease --stacktrace
 
     - name: Publish AAB artifacts to Google Play Store internal tracks
       run: bundle exec fastlane deploy_internal
 
-    - name: Build Android OS and Wear OS release APKs
+    - name: Build release APK artifacts
       run: bash ./gradlew assembleRelease --stacktrace
 
     - name: Rename APK artifacts
       run: |
-        mv "./androidos/build/outputs/apk/release/androidos-release.apk" "./androidos/build/outputs/apk/release/${{ env.OUTPUT_NAME }}-androidos.apk"
-        mv "./wearos/build/outputs/apk/release/wearos-release.apk" "./wearos/build/outputs/apk/release/${{ env.OUTPUT_NAME }}-wearos.apk"
-
-    - name: Rename AAB artifacts
-      run:
-        mv "./androidos/build/outputs/bundle/release/androidos-release.aab" "./androidos/build/outputs/bundle/release/${{ env.OUTPUT_NAME }}-androidos.aab"
-        mv "./wearos/build/outputs/bundle/release/wearos-release.aab" "./wearos/build/outputs/bundle/release/${{ env.OUTPUT_NAME }}-wearos.aab"
+        mv "./androidos/build/outputs/apk/release/androidos-release.apk" "./androidos/build/outputs/apk/release/${{ env.ANDROID_OS_FILE_NAME }}.apk"
+        mv "./wearos/build/outputs/apk/release/wearos-release.apk" "./wearos/build/outputs/apk/release/${{ env.WEAR_OS_FILE_NAME }}.apk"
 
     - name: Upload release APK and ABB artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.OUTPUT_NAME }}
+        name: tennis-scoreboard-artifacts
         path: |
-          ./androidos/build/outputs/apk/release/${{ env.OUTPUT_NAME }}.apk
-          ./androidos/build/outputs/bundle/release/${{ env.OUTPUT_NAME }}.aab
-          ./wearos/build/outputs/apk/release/${{ env.OUTPUT_NAME }}-wearos.apk
-          ./wearos/build/outputs/bundle/release/${{ env.OUTPUT_NAME }}-wearos.aab
+          ./androidos/build/outputs/apk/release/${{ env.ANDROID_OS_FILE_NAME }}.apk
+          ./wearos/build/outputs/apk/release/${{ env.WEAR_OS_FILE_NAME }}.apk
diff --git a/wearos/build.gradle.kts b/wearos/build.gradle.kts
@@ -25,7 +25,7 @@ val gitBranchName = providers.exec {
 
 android {
     namespace = "se.dennisgimbergsson.tennisscoreboard"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "se.dennisgimbergsson.tennisscoreboard"