github action: split android in build + test & remove prepare stage as android and iOS have no longer shared test package

Author: hannojg

.github/workflows/harness-aws-device.yml

@@ -62,12 +62,13 @@ env:
   HARNESS_ANDROID_APP_BUILD_OUTPUT: apps/simple-camera/android/app/build/outputs/apk/debug/app-debug.apk
   HARNESS_IOS_APP_BUILD_OUTPUT: apps/simple-camera/ios/build/devicefarm/SimpleCamera.ipa
   HARNESS_IOS_DERIVED_DATA_OUTPUT: apps/simple-camera/ios/build/devicefarm/DerivedData
+  HARNESS_ANDROID_APK_ARTIFACT_NAME: harness-android-apk
   HARNESS_IOS_IPA_ARTIFACT_NAME: harness-ios-ipa
   HARNESS_IOS_HARNESS_XCTEST_RUNNER_IPA_ARTIFACT_NAME: harness-xctest-agent-ipa
   HARNESS_IOS_HARNESS_XCTEST_RUNNER_IPA_PATH: apps/simple-camera/ios/build/devicefarm/HarnessXCTestAgentUITests.ipa
   HARNESS_IOS_XCTEST_UI_TEST_PACKAGE_OUTPUT: apps/simple-camera/ios/build/devicefarm/HarnessXCTestUITestPackage.zip
   HARNESS_DEVICE_FARM_REPO_ARCHIVE_NAME: react-native-vision-camera.zip
-  HARNESS_DEVICE_FARM_TEST_PACKAGE_OUTPUT: devicefarm-test-package.zip
+  HARNESS_ANDROID_DEVICE_FARM_TEST_PACKAGE_OUTPUT: apps/simple-camera/android/build/devicefarm/AndroidTestPackage.zip
   HARNESS_ANDROID_BUNDLE_ID: com.margelo.nitro.camera.example.simple
   HARNESS_ANDROID_DEVICE_ARCH: ${{ github.event.inputs.device_arch || 'arm64-v8a' }}
   # Name of the device pools on AWS to pick devices from.
@@ -127,77 +128,12 @@ jobs:
           echo "run_android=${{ steps.filter.outputs.android == 'true' || steps.filter.outputs.shared == 'true' }}" >> "$GITHUB_OUTPUT"
           echo "run_ios=${{ steps.filter.outputs.ios == 'true' || steps.filter.outputs.shared == 'true' }}" >> "$GITHUB_OUTPUT"
 
-  prepare-devicefarm-assets:
-    name: Prepare Device Farm Assets
-    runs-on: ubuntu-latest
-    needs:
-      - detect-changes
-    if: ${{ needs.detect-changes.outputs.run_android == 'true' || needs.detect-changes.outputs.run_ios == 'true' }}
-    outputs:
-      test_package_arn: ${{ steps.upload-test-package.outputs.upload-arn }}
-      android_test_spec_arn: ${{ steps.upload-android-test-spec.outputs.upload-arn }}
-      ios_test_spec_arn: ${{ steps.upload-ios-test-spec.outputs.upload-arn }}
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 1
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
-        with:
-          role-to-assume: arn:aws:iam::633665345122:role/GitHubDeviceFarmRole
-          aws-region: ${{ env.HARNESS_AWS_REGION }}
-
-      - name: Create Device Farm test package zip
-        run: |
-          rm -f "${{ env.HARNESS_DEVICE_FARM_TEST_PACKAGE_OUTPUT }}"
-          git archive \
-            --format=zip \
-            --output "${{ env.HARNESS_DEVICE_FARM_TEST_PACKAGE_OUTPUT }}" \
-            HEAD
-          unzip -tq "${{ env.HARNESS_DEVICE_FARM_TEST_PACKAGE_OUTPUT }}"
-
-      - name: Upload Device Farm test package
-        id: upload-test-package
-        uses: ./.github/actions/upload-devicefarm-artifact
-        with:
-          project-arn: ${{ env.HARNESS_DEVICE_FARM_PROJECT_ARN }}
-          aws-region: ${{ env.HARNESS_AWS_REGION }}
-          file-path: ${{ env.HARNESS_DEVICE_FARM_TEST_PACKAGE_OUTPUT }}
-          upload-type: APPIUM_NODE_TEST_PACKAGE
-          content-type: application/zip
-          upload-name: DeviceFarmTestPackage-${{ github.run_id }}-${{ github.run_attempt }}.zip
-
-      - name: Upload Device Farm Android test spec
-        id: upload-android-test-spec
-        uses: ./.github/actions/upload-devicefarm-artifact
-        with:
-          project-arn: ${{ env.HARNESS_DEVICE_FARM_PROJECT_ARN }}
-          aws-region: ${{ env.HARNESS_AWS_REGION }}
-          file-path: apps/simple-camera/device-farm-tests/AwsTestSpec.yml
-          upload-type: APPIUM_NODE_TEST_SPEC
-          content-type: application/octet-stream
-          upload-name: AwsTestSpecAndroid-${{ github.run_id }}-${{ github.run_attempt }}.yml
-
-      - name: Upload Device Farm iOS test spec
-        if: ${{ needs.detect-changes.outputs.run_ios == 'true' }}
-        id: upload-ios-test-spec
-        uses: ./.github/actions/upload-devicefarm-artifact
-        with:
-          project-arn: ${{ env.HARNESS_DEVICE_FARM_PROJECT_ARN }}
-          aws-region: ${{ env.HARNESS_AWS_REGION }}
-          file-path: apps/simple-camera/device-farm-tests/AwsTestSpecIOS.yml
-          upload-type: XCTEST_UI_TEST_SPEC
-          content-type: application/octet-stream
-          upload-name: AwsTestSpecIOS-${{ github.run_id }}-${{ github.run_attempt }}.yml
-
-  test-android:
-    name: Test Android
+  build-android:
+    name: Build Android
     runs-on: ubuntu-latest
     timeout-minutes: 45
     needs:
       - detect-changes
-      - prepare-devicefarm-assets
     if: ${{ needs.detect-changes.outputs.run_android == 'true' }}
     steps:
       - uses: actions/checkout@v6
@@ -233,12 +169,6 @@ jobs:
             ${{ runner.os }}-gradle-${{ env.HARNESS_ANDROID_DEVICE_ARCH }}-
             ${{ runner.os }}-gradle-
 
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
-        with:
-          role-to-assume: arn:aws:iam::633665345122:role/GitHubDeviceFarmRole
-          aws-region: ${{ env.HARNESS_AWS_REGION }}
-
       - name: Restore Android app from cache
         id: cache-apk-restore
         uses: actions/cache/restore@v4
@@ -261,6 +191,84 @@ jobs:
       - name: Verify Android app artifact
         run: test -f ${{ env.HARNESS_ANDROID_APP_BUILD_OUTPUT }}
 
+      - name: Upload Android app artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.HARNESS_ANDROID_APK_ARTIFACT_NAME }}
+          path: ${{ env.HARNESS_ANDROID_APP_BUILD_OUTPUT }}
+          if-no-files-found: error
+          retention-days: 7
+
+  test-android:
+    name: Test Android
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    needs:
+      - detect-changes
+      - build-android
+    if: ${{ needs.detect-changes.outputs.run_android == 'true' }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+
+      - name: Download Android app artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.HARNESS_ANDROID_APK_ARTIFACT_NAME }}
+          path: apps/simple-camera/android/app/build/outputs/apk/debug
+
+      - name: Verify Android app artifact
+        run: test -f ${{ env.HARNESS_ANDROID_APP_BUILD_OUTPUT }}
+
+      - name: Create Android Device Farm test package
+        run: |
+          set -euo pipefail
+
+          PACKAGE_PATH="${{ env.HARNESS_ANDROID_DEVICE_FARM_TEST_PACKAGE_OUTPUT }}"
+          PACKAGE_DIR="$(dirname "$PACKAGE_PATH")"
+
+          rm -f "$PACKAGE_PATH"
+          mkdir -p "$PACKAGE_DIR"
+
+          git archive \
+            --format=zip \
+            --output "$PACKAGE_PATH" \
+            HEAD
+
+          unzip -tq "$PACKAGE_PATH"
+
+      - name: Verify Android Device Farm test package
+        run: test -f ${{ env.HARNESS_ANDROID_DEVICE_FARM_TEST_PACKAGE_OUTPUT }}
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v6
+        with:
+          role-to-assume: arn:aws:iam::633665345122:role/GitHubDeviceFarmRole
+          aws-region: ${{ env.HARNESS_AWS_REGION }}
+
+      - name: Upload Android test package to AWS Device Farm
+        id: upload-android-test-package
+        uses: ./.github/actions/upload-devicefarm-artifact
+        with:
+          project-arn: ${{ env.HARNESS_DEVICE_FARM_PROJECT_ARN }}
+          aws-region: ${{ env.HARNESS_AWS_REGION }}
+          file-path: ${{ env.HARNESS_ANDROID_DEVICE_FARM_TEST_PACKAGE_OUTPUT }}
+          upload-type: APPIUM_NODE_TEST_PACKAGE
+          content-type: application/zip
+          upload-name: AndroidTestPackage-${{ github.run_id }}-${{ github.run_attempt }}.zip
+
+      - name: Upload Android test spec to AWS Device Farm
+        id: upload-android-test-spec
+        uses: ./.github/actions/upload-devicefarm-artifact
+        with:
+          project-arn: ${{ env.HARNESS_DEVICE_FARM_PROJECT_ARN }}
+          aws-region: ${{ env.HARNESS_AWS_REGION }}
+          file-path: apps/simple-camera/device-farm-tests/AwsTestSpec.yml
+          upload-type: APPIUM_NODE_TEST_SPEC
+          content-type: application/octet-stream
+          upload-name: AwsTestSpecAndroid-${{ github.run_id }}-${{ github.run_attempt }}.yml
+
       - name: Upload APK to AWS Device Farm
         id: upload-apk
         uses: ./.github/actions/upload-devicefarm-artifact
@@ -283,8 +291,8 @@ jobs:
               "devicePoolArn": "${{ env.HARNESS_DEVICE_FARM_ANDROID_DEVICE_POOL_ARN }}",
               "test": {
                 "type": "APPIUM_NODE",
-                "testPackageArn": "${{ needs.prepare-devicefarm-assets.outputs.test_package_arn }}",
-                "testSpecArn": "${{ needs.prepare-devicefarm-assets.outputs.android_test_spec_arn }}"
+                "testPackageArn": "${{ steps.upload-android-test-package.outputs['upload-arn'] }}",
+                "testSpecArn": "${{ steps.upload-android-test-spec.outputs['upload-arn'] }}"
               }
             }
           artifact-types: ALL
@@ -476,7 +484,6 @@ jobs:
     timeout-minutes: 45
     needs:
       - detect-changes
-      - prepare-devicefarm-assets
       - build-ios
     if: ${{ needs.detect-changes.outputs.run_ios == 'true' }}
     steps:
@@ -562,9 +569,21 @@ jobs:
           content-type: application/zip
           upload-name: harness-xctest-ui-package-${{ github.run_id }}-${{ github.run_attempt }}.zip
 
+      - name: Upload iOS test spec to AWS Device Farm
+        id: upload-ios-test-spec
+        uses: ./.github/actions/upload-devicefarm-artifact
+        with:
+          project-arn: ${{ env.HARNESS_DEVICE_FARM_PROJECT_ARN }}
+          aws-region: ${{ env.HARNESS_AWS_REGION }}
+          file-path: apps/simple-camera/device-farm-tests/AwsTestSpecIOS.yml
+          upload-type: XCTEST_UI_TEST_SPEC
+          content-type: application/octet-stream
+          upload-name: AwsTestSpecIOS-${{ github.run_id }}-${{ github.run_attempt }}.yml
+
       - name: Schedule Device Farm iOS Automated Test
         id: run-test
         uses: aws-actions/aws-devicefarm-mobile-device-testing@v2.3
+        continue-on-error: true
         with:
           run-settings-json: |
             {
@@ -575,7 +594,7 @@ jobs:
               "test": {
                 "type": "XCTEST_UI",
                 "testPackageArn": "${{ steps.upload-xctest-ui-package.outputs['upload-arn'] }}",
-                "testSpecArn": "${{ needs.prepare-devicefarm-assets.outputs.ios_test_spec_arn }}"
+                "testSpecArn": "${{ steps.upload-ios-test-spec.outputs['upload-arn'] }}"
               }
             }
           artifact-types: ALL
@@ -586,3 +605,4 @@ jobs:
         with:
           artifact-folder: ${{ steps.run-test.outputs.artifact-folder }}
           platform: ios
+          test-step-outcome: ${{ steps.run-test.outcome }}