build: split build and deploy for flipcash to optimize CI

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

.github/workflows/build-fcash-upload-android.yml

@@ -4,6 +4,11 @@ env:
   main_project_module: apps:flipcash:app
   playstore_name: Flipcash
 
+# Cancel in-progress workflow runs if a job fails
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.inputs.track }}-${{ github.event.inputs.release_status }}
+  cancel-in-progress: true
+
 on:
   workflow_dispatch:
     inputs:
@@ -95,10 +100,24 @@ jobs:
       - name: Cache Gradle
         uses: actions/cache@v3
         with:
-          path: ~/.gradle/caches
-          key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle.properties') }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle.properties', '**/gradle/wrapper/*') }}
           restore-keys: gradle-
 
+      - name: Upload Setup Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: setup-files
+          path: |
+            ${{ steps.google_services_json_file.outputs.filePath }}
+            ${{ steps.service_account_json_file.outputs.filePath }}
+            ${{ steps.signing_key.outputs.filePath }}
+            ./apps/flipcash/app/key/key
+            ./local.properties
+          if-no-files-found: error
+
   tests:
     needs: setup
     runs-on: ubuntu-latest
@@ -107,74 +126,136 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup Ruby env
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+          bundler-cache: true
+
       - name: Restore Gradle Cache
         uses: actions/cache/restore@v3
         with:
-          path: ~/.gradle/caches
-          key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle.properties') }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle.properties', '**/gradle/wrapper/*') }}
           restore-keys: gradle-
 
+      - name: Download Setup Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: setup-files
+          path: setup-files/
+
+      - name: "Debug: List downloaded artifacts"
+        run: |
+          echo "Listing downloaded setup-files:"
+          find ./setup-files -type f
+          echo "Checking setup-files/local.properties:"
+          cat ./setup-files/local.properties || echo "local.properties not found"
+
       - name: Copy Setup Files
         run: |
           mkdir -p ./apps/flipcash/app/src
           mkdir -p ./key
           mkdir -p ./apps/flipcash/app/key
-          cp ${{ needs.setup.outputs.google_services_json }} ./apps/flipcash/app/src/google-services.json
-          cp ${{ needs.setup.outputs.service_account_json }} ./serviceAccount.json
-          cp ${{ needs.setup.outputs.signing_key }} ./key/key
-          cp ${{ needs.setup.outputs.signing_key }} ./apps/flipcash/app/key/key
-          echo BUGSNAG_API_KEY=\"${{ secrets.FLIPCASH_BUGSNAG_API_KEY }}\" > ./local.properties
-          echo GOOGLE_CLOUD_PROJECT_NUMBER=${{ secrets.GOOGLE_CLOUD_PROJECT_NUMBER }} >> ./local.properties
-          echo MIXPANEL_API_KEY=\"${{ secrets.FLIPCASH_MIXPANEL_API_KEY }}\" >> ./local.properties
+          cp ./setup-files/apps/flipcash/app/src/google-services.json ./apps/flipcash/app/src/google-services.json || echo "Failed to copy google-services.json"
+          cp ./setup-files/serviceAccount.json ./serviceAccount.json || echo "Failed to copy serviceAccount.json"
+          cp ./setup-files/key/key ./key/key || echo "Failed to copy key/key"
+          cp ./setup-files/apps/flipcash/app/key/key ./apps/flipcash/app/key/key || echo "Failed to copy apps/flipcash/app/key/key"
+          cp ./setup-files/local.properties ./local.properties || echo "Failed to copy local.properties"
 
       - name: Run tests
         run: bundle exec fastlane android flipcash_tests
 
-  deploy:
+  build:
     needs: setup
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup Ruby env
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+          bundler-cache: true
+
       - name: Restore Gradle Cache
         uses: actions/cache/restore@v3
         with:
-          path: ~/.gradle/caches
-          key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle.properties') }}
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle.properties', '**/gradle/wrapper/*') }}
           restore-keys: gradle-
 
+      - name: Download Setup Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: setup-files
+          path: setup-files/
+
+      - name: "Debug: List downloaded artifacts"
+        run: |
+          echo "Listing downloaded setup-files:"
+          find ./setup-files -type f
+          echo "Checking setup-files/local.properties:"
+          cat ./setup-files/local.properties || echo "local.properties not found"
+
       - name: Copy Setup Files
         run: |
           mkdir -p ./apps/flipcash/app/src
           mkdir -p ./key
           mkdir -p ./apps/flipcash/app/key
-          cp ${{ needs.setup.outputs.google_services_json }} ./apps/flipcash/app/src/google-services.json
-          cp ${{ needs.setup.outputs.service_account_json }} ./serviceAccount.json
-          cp ${{ needs.setup.outputs.signing_key }} ./key/key
-          cp ${{ needs.setup.outputs.signing_key }} ./apps/flipcash/app/key/key
-          echo BUGSNAG_API_KEY=\"${{ secrets.FLIPCASH_BUGSNAG_API_KEY }}\" > ./local.properties
-          echo GOOGLE_CLOUD_PROJECT_NUMBER=${{ secrets.GOOGLE_CLOUD_PROJECT_NUMBER }} >> ./local.properties
-          echo MIXPANEL_API_KEY=\"${{ secrets.FLIPCASH_MIXPANEL_API_KEY }}\" >> ./local.properties
-
-      - name: Build & deploy Android release
-        run: bundle exec fastlane android deploy_flipcash
+          cp ./setup-files/apps/flipcash/app/src/google-services.json ./apps/flipcash/app/src/google-services.json || echo "Failed to copy google-services.json"
+          cp ./setup-files/serviceAccount.json ./serviceAccount.json || echo "Failed to copy serviceAccount.json"
+          cp ./setup-files/key/key ./key/key || echo "Failed to copy key/key"
+          cp ./setup-files/apps/flipcash/app/key/key ./apps/flipcash/app/key/key || echo "Failed to copy apps/flipcash/app/key/key"
+          cp ./setup-files/local.properties ./local.properties || echo "Failed to copy local.properties"
+
+      - name: Build Android release
+        run: bundle exec fastlane android build_flipcash
         env:
           STORE_FILE: ${{ needs.setup.outputs.signing_key }}
           STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          SERVICE_ACCOUNT_KEY_JSON: ${{ needs.setup.outputs.service_account_json }}
-          PACKAGE_NAME: com.flipcash.android.app
-          PLAYSTORE_TRACK: ${{ github.event.inputs.track }}
-          RELEASE_STATUS: ${{ github.event.inputs.release_status }}
 
-      - name: Upload build artifacts
+      - name: Upload Build Artifacts
         uses: actions/upload-artifact@v4
-        if: always()
         with:
-          name: assets
+          name: build-assets
           path: |
-            ${{ github.workspace }}/apps/flipcash/app/build/outputs/bundle/release
-            ${{ github.workspace }}/apps/flipcash/app/build/outputs/apk/release
+            ${{ github.workspace }}/artifacts/*.aab
+            ${{ github.workspace }}/artifacts/*.txt
+          if-no-files-found: error
+
+  deploy:
+    needs: [tests, build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Ruby env
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+          bundler-cache: true
+
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: build-assets
+          path: artifacts/
+
+      - name: Deploy to Play Store
+        run: bundle exec fastlane android deploy_to_play_store
+        env:
+          SERVICE_ACCOUNT_KEY_JSON: ${{ needs.setup.outputs.service_account_json }}
+          PACKAGE_NAME: com.flipcash.android.app
+          PLAYSTORE_TRACK: ${{ github.event.inputs.track }}
+          RELEASE_STATUS: ${{ github.event.inputs.release_status }}

fastlane/Fastfile

@@ -114,45 +114,37 @@ platform :android do
       )
     end
 
-desc "Build and Deploy a new version of Flipcash to the Google Play Store"
-    lane :deploy_flipcash do
+    desc "Build a new version of Flipcash"
+    lane :build_flipcash do
       gradle(
-        task: "clean apps:flipcash:app:bundle", #"clean app:bundleRelease",
+        task: "clean apps:flipcash:app:bundle",
         build_type: "release",
         properties: {
-          #"versionPatch" => ENV["BUILD_NUMBER"],
           "android.injected.signing.store.file" => ENV["STORE_FILE"],
           "android.injected.signing.store.password" => ENV["STORE_PASSWORD"],
           "android.injected.signing.key.alias" => ENV["KEY_ALIAS"],
           "android.injected.signing.key.password" => ENV["KEY_PASSWORD"]
         }
       )
 
-      bundletool(
-        ks_path: ENV["STORE_FILE"],
-        ks_password: ENV["STORE_PASSWORD"],
-        ks_key_alias: ENV["KEY_ALIAS"],
-        ks_key_alias_password: ENV["KEY_PASSWORD"],
-        bundletool_version: '1.10.0',
-        aab_path: Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH],
-        apk_output_path: "apps/flipcash/app/build/outputs/apk/release",
-        verbose: true,
-      )
+      sh("mkdir -p ../artifacts && cp #{Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH]} ../artifacts/")
+      sh("cp #{Actions.lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH]} ../artifacts/") if File.exist?(Actions.lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH])
+    end
 
+    desc "Deploy a new version of Flipcash to the Google Play Store"
+    lane :deploy_to_play_store do
       validate_play_store_json_key(
         json_key: ENV["SERVICE_ACCOUNT_KEY_JSON"]
       )
-
       upload_to_play_store(
         track: ENV["PLAYSTORE_TRACK"],
         release_status: ENV["RELEASE_STATUS"],
-        aab: Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH],
+        aab: "../artifacts/#{File.basename(Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH])}",
         skip_upload_apk: true,
         skip_upload_changelogs: true,
         skip_upload_images: true,
         package_name: ENV["PACKAGE_NAME"],
-        mapping: Actions.lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH]
-      #  mapping: mapping_file_exists() ? Actions.lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH] : nil
+        mapping: File.exist?("../artifacts/#{File.basename(Actions.lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH])}") ? "../artifacts/#{File.basename(Actions.lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH])}" : nil
       )
     end
 end