update workflows for Android and use gcloud beta

didomi · Aug 12, 2024 · d9544af · d9544af
1 parent 458f670
commit d9544af
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -84,7 +84,7 @@ jobs:
 
       - name: Build Android App
         run: |
-          npx react-native bundle --platform android --dev false --entry-file index.tsx --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/
+          npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/
           cd android && ./gradlew assembleDebug --no-daemon
 
       - name: Upload Android App APK
@@ -113,15 +113,18 @@ jobs:
         uses: google-github-actions/setup-gcloud@v2
         with:
           project_id: ${{ secrets.FIREBASE_PROJECT_ID }}
+          install_components: 'beta'
 
       - name: Run Instrumentation Tests in Firebase Test Lab
         run: |
-          gcloud firebase test android run --type instrumentation \
-          --app android/app/build/outputs/apk/debug/app-debug.apk \
-          --test android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
+          gcloud beta firebase test android run \
+          --type=instrumentation \
+          --app=android/app/build/outputs/apk/debug/app-debug.apk \
+          --test=android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
           --use-orchestrator \
-          --device model=MediumPhone.arm,version=33,locale=en,orientation=portrait \
-          --num-flaky-test-attempts=3
+          --device="model=MediumPhone.arm,version=34,locale=en,orientation=portrait" \
+          --num-flaky-test-attempts=3 \
+          --quiet
 
   test_ios:
     name: Testing iOS
@@ -134,6 +137,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -49,6 +49,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
@@ -87,7 +93,7 @@ jobs:
 
     - name: Build Android App
       run: |
-        npx react-native bundle --platform android --dev false --entry-file index.tsx --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/
+        npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/
         cd android && ./gradlew assembleDebug --no-daemon
 
     - name: Upload Android App APK
@@ -116,15 +122,18 @@ jobs:
       uses: google-github-actions/setup-gcloud@v2
       with:
         project_id: ${{ secrets.FIREBASE_PROJECT_ID }}
+        install_components: 'beta'
 
     - name: Run Instrumentation Tests in Firebase Test Lab
       run: |
-        gcloud firebase test android run --type instrumentation \
-        --app android/app/build/outputs/apk/debug/app-debug.apk \
-        --test android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
+        gcloud beta firebase test android run \
+        --type=instrumentation \
+        --app=android/app/build/outputs/apk/debug/app-debug.apk \
+        --test=android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
         --use-orchestrator \
-        --device model=MediumPhone.arm,version=33,locale=en,orientation=portrait \
-        --num-flaky-test-attempts=3
+        --device="model=MediumPhone.arm,version=34,locale=en,orientation=portrait" \
+        --num-flaky-test-attempts=3 \
+        --quiet
   
   ios:
     needs: js