Refine e2e CI task (#2612)

Author: wcandillon

.github/workflows/android.yml

@@ -10,6 +10,10 @@ on:
     types:
       - checks_requested
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -220,6 +224,94 @@ jobs:
         run: |
           yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1
 
+      - name: Cache apk
+        uses: actions/cache/save@v3
+        env:
+          cache-name: cache-apk
+        with:
+          path: apps/paper/android/app/build/outputs/apk/debug/app-debug.apk
+          key: apk-${{ github.sha }}
+
+  test-android:
+    needs: build-android
+    runs-on: macos-latest-large
+    strategy:
+      matrix:
+        working-directory: [apps/paper]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Restore APK
+        id: cache-apk
+        uses: actions/cache/restore@v3
+        with:
+          path: ${{ matrix.working-directory }}/android/app/build/outputs/apk/debug/app-debug.apk
+          key: apk-${{ github.sha }}
+      
+      - name: SKDs - download required images
+        run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "system-images;android-30;default;x86_64"
+
+      - name: Emulator - Create
+        run: $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n Pixel_API_30 --device 'Nexus 5X' --package "system-images;android-30;default;x86_64" --sdcard 512M
+
+      - name: Emulator - Boot
+        run: $ANDROID_HOME/emulator/emulator -memory 4096 -avd Pixel_API_30 -wipe-data -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim &
+
+      - name: ADB Wait For Device
+        run: adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;'
+        timeout-minutes: 10
+
+      - name: Start Package Manager
+        working-directory: ${{ matrix.working-directory }}
+        run: E2E=true yarn start &
+
+      - name: Check APK existence
+        uses: andstor/file-existence-action@v2
+        with:
+          files: ${{ matrix.working-directory }}/android/app/build/outputs/apk/debug/app-debug.apk
+          fail: true
+
+      - name: Install APK
+        run: adb install -r ${{ matrix.working-directory }}/android/app/build/outputs/apk/debug/app-debug.apk
+
+      # - name: Set up environment
+      #   run: echo "PACKAGE_NAME=${{ env.PACKAGE_NAME }}" >> $GITHUB_ENV
+      - name: Launch APK
+        env:
+          PACKAGE_NAME: ${{ matrix.working-directory == 'fabricexample' && 'com.fabricexample' || 'com.paper' }}  
+        run: adb shell monkey -p ${{ env.PACKAGE_NAME }} 1  
+
+      # On fabric, the system fonts are slightly different
+      # so wont run the paragraph tests there for now
+      - name: Run e2e Tests
+        working-directory: packages/skia
+        run: |
+          if [ "${{ matrix.working-directory }}" = "apps/paper" ]; then
+            CI=true yarn e2e
+          elif [ "${{ matrix.working-directory }}" = "apps/none" ]; then
+            CI=true yarn e2e --testPathIgnorePatterns Paragraphs
+          fi
+
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          path: packages/skia/src/__tests__/snapshots/
+          name: ${{ matrix.working-directory }}-snapshots-screenshots
+
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          path: apps/docs/static
+          name: ${{ matrix.working-directory }}-docs-screenshots
+
   build-ios:
     runs-on: macos-latest-large
     env:
@@ -251,26 +343,6 @@ jobs:
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
           fi
 
-      - name: Cache cocoapods
-        if: env.turbo_cache_hit != 1
-        id: cocoapods-cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/ios/Pods
-          key: ${{ runner.os }}-cocoapods-${{ hashFiles('./apps/paper/ios/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cocoapods-
-
-      - name: Install cocoapods
-        run: |
-          cd apps/paper/ios
-          pod install
-          cd ../../fabric/ios
-          pod install
-        env:
-          NO_FLIPPER: 1
-
       - name: Build example for iOS
         run: |
-          yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+          yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ And then the _SDK Location_ section. It will show you the NDK path, or the optio
 - Go to the package folder `cd packages/skia`
 - Build the Skia libraries with `yarn build-skia` (this can take a while)
 - Copy Skia headers `yarn copy-skia-headers`
-- run `pod install` in `apps/papepr/ios` and `apps/fabric/ios`
+- run `yarn pod:install`
 
 ### Upgrading
 

README.md

@@ -20,7 +20,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-**/.xcode.env.local
 
 # Android/IntelliJ
 #

apps/fabric/.gitignore

@@ -0,0 +1 @@
+export NODE_BINARY=$(command -v node)

apps/fabric/ios/.xcode.env.local

@@ -9,6 +9,7 @@
     "start": "react-native start",
     "test": "node --experimental-vm-modules ../../node_modules/.bin/jest",
     "tsc": "tsc --noEmit",
+    "pod:install": "cd ios && pod install",
     "build:android": "cd android && ./gradlew assembleDebug --warning-mode all",
     "build:ios": "npm run mkdist && react-native bundle --entry-file index.js --platform ios --dev true --bundle-output dist/main.ios.jsbundle --assets-dest dist && react-native build-ios --scheme fabric --mode Debug --extra-params \"-sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO\"",
     "mkdist": "node -e \"require('node:fs').mkdirSync('dist', { recursive: true, mode: 0o755 })\""

apps/fabric/package.json

@@ -20,7 +20,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-**/.xcode.env.local
 
 # Android/IntelliJ
 #

apps/paper/.gitignore

@@ -0,0 +1 @@
+export NODE_BINARY=$(command -v node)

apps/paper/ios/.xcode.env.local

@@ -9,6 +9,7 @@
     "start": "react-native start",
     "test": "node --experimental-vm-modules ../../node_modules/.bin/jest",
     "tsc": "tsc --noEmit",
+    "pod:install": "cd ios && pod install",
     "build:android": "cd android && ./gradlew assembleDebug --warning-mode all",
     "build:ios": "npm run mkdist && react-native bundle --entry-file index.js --platform ios --dev true --bundle-output dist/main.ios.jsbundle --assets-dest dist && react-native build-ios --scheme paper --mode Debug --extra-params \"-sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO\"",
     "mkdist": "node -e \"require('node:fs').mkdirSync('dist', { recursive: true, mode: 0o755 })\""

apps/paper/package.json

@@ -26,7 +26,8 @@
     "test": "turbo run test",
     "build": "turbo run build",
     "build:ios": "turbo run build:ios",
-    "build:android": "turbo run build:android"
+    "build:android": "turbo run build:android",
+    "pod:install": "turbo run pod:install"
   },
   "packageManager": "[email protected]",
   "devDependencies": {