Merge branch 'master' into graph-debugging

Author: Jasonvdb

.github/scripts/test-ios.sh

@@ -0,0 +1,89 @@
+name: e2e-android
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  e2e-android:
+    runs-on: macos-12
+    timeout-minutes: 120
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
+      - name: Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn' # cache packages, but not node_modules
+          cache-dependency-path: 'example/yarn.lock'
+
+      - name: Cache lib node modules
+        uses: actions/cache@v3
+        id: lib-npmcache
+        with:
+          path: lib/node_modules
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Install lib dependencies
+        if: steps.lib-npmcache.outputs.cache-hit != 'true'
+        working-directory: lib
+        run: yarn install
+
+      - name: Build lib
+        working-directory: lib
+        run: yarn build
+
+      - name: Use gradle caches
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      # - name: Cache node modules
+      #   uses: actions/cache@v3
+      #   id: cache-nm
+      #   with:
+      #     path: node_modules
+      #     key: node-modules-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Install node_modules
+        working-directory: example
+        run: yarn install && yarn rn-setup
+
+      - name: Use specific Java version for sdkmanager to work
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Build
+        working-directory: example
+        run: yarn e2e:build:android-release
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 31
+          avd-name: Pixel_API_31_AOSP
+          emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-back none -camera-front none -partition-size 2047
+          arch: x86_64
+          disable-animations: true
+          working-directory: example
+          script: yarn e2e:test:android-release || yarn e2e:test:android-release || yarn e2e:test:android-release
+
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: e2e-test-videos
+          path: ./example/artifacts/

.github/workflows/e2e-android.yml

@@ -4,21 +4,27 @@ on:
   pull_request:
     branches:
       - 'master'
+  push:
+    branches:
+      - 'master'
 
 jobs:
-  e2e-test:
-    name: E2E iOS test
-    runs-on: macOS-latest
-    timeout-minutes: 35
+  e2e-ios:
+    runs-on: macos-12
+    timeout-minutes: 120
 
     steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v1
+      - name: Node
+        uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
+          cache: 'yarn' # cache packages, but not node_modules
+          cache-dependency-path: 'example/yarn.lock'
 
       - name: Cache lib node modules
         uses: actions/cache@v3
@@ -38,20 +44,25 @@ jobs:
 
       - name: Cache app node modules
         uses: actions/cache@v3
-        id: app-npmcache
+        id: cache-nm
         with:
           path: example/node_modules
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
 
       - name: Rebuild detox
-        if: steps.app-npmcache.outputs.cache-hit == 'true'
+        if: steps.cache-nm.outputs.cache-hit == 'true'
         working-directory: example
         run: yarn detox clean-framework-cache && yarn detox build-framework-cache
 
-      - name: Install app dependencies
-        if: steps.app-npmcache.outputs.cache-hit != 'true'
+      - name: Install Dependencies
+        if: steps.cache-nm.outputs.cache-hit != 'true'
         working-directory: example
-        run: yarn install
+        run: yarn install && yarn rn-setup
+
+      # - name: Activate react-native-skia-stup
+      #   run: |
+      #     yarn add @shopify/react-native-skia@0.1.156 git+ssh://git@github.com/limpbrains/react-native-skia-stub
+      #     patch -p1 < .github/workflows/react-native-skia-stub.patch
 
       - name: Cache Pods
         uses: actions/cache@v3
@@ -60,19 +71,27 @@ jobs:
           path: example/ios/Pods
           key: pods-${{ hashFiles('**/Podfile.lock') }}
 
-      - name: Install pods and rn-nodify
+      - name: Install pods
         working-directory: example
         run: |
           gem update cocoapods xcodeproj
-          yarn rn-setup
+          cd ios && pod install && cd ..
 
-      - name: Install brew dependencies
-        run: brew tap wix/brew && brew install applesimutils
+      - name: Install applesimutils
+        run: |
+          brew tap wix/brew
+          brew install applesimutils
 
-      - name: Build iOS app
+      - name: Build
         working-directory: example
-        run: yarn e2e:ios-build
+        run: yarn e2e:build:ios-release
 
       - name: Test iOS app
         working-directory: example
-        run: sh ../.github/scripts/test-ios.sh
+        run: yarn e2e:test:ios-release || yarn e2e:test:ios-release || yarn e2e:test:ios-release
+
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: e2e-test-videos
+          path: ./example/artifacts/

.github/workflows/e2e-ios.yml

@@ -0,0 +1,83 @@
+/** @type {Detox.DetoxConfig} */
+module.exports = {
+  testRunner: {
+    args: {
+      '$0': 'jest',
+      config: 'e2e/jest.config.js'
+    },
+    jest: {
+      setupTimeout: 360000
+    }
+  },
+  apps: {
+    'ios.debug': {
+      type: 'ios.app',
+      binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/exmpl.app',
+      build: 'xcodebuild -workspace ios/exmpl.xcworkspace -scheme exmpl -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build'
+    },
+    'ios.release': {
+      type: 'ios.app',
+      binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/exmpl.app',
+      build: 'xcodebuild -workspace ios/exmpl.xcworkspace -scheme exmpl -configuration Release -sdk iphonesimulator -derivedDataPath ios/build'
+    },
+    'android.debug': {
+      type: 'android.apk',
+      binaryPath: 'android/app/build/outputs/apk/debug/app-debug.apk',
+      build: 'cd android ; ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug ; cd -',
+      reversePorts: [
+        8081
+      ]
+    },
+    'android.release': {
+      type: 'android.apk',
+      binaryPath: 'android/app/build/outputs/apk/release/app-release.apk',
+      build: 'cd android ; ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release ; cd -'
+    }
+  },
+  devices: {
+    simulator: {
+      type: 'ios.simulator',
+      device: {
+        type: 'iPhone 14'
+      }
+    },
+    attached: {
+      type: 'android.attached',
+      device: {
+        adbName: '.*'
+      }
+    },
+    emulator: {
+      type: 'android.emulator',
+      device: {
+        avdName: 'Pixel_API_31_AOSP'
+      }
+    }
+  },
+  configurations: {
+    'ios.sim.debug': {
+      device: 'simulator',
+      app: 'ios.debug'
+    },
+    'ios.sim.release': {
+      device: 'simulator',
+      app: 'ios.release'
+    },
+    'android.att.debug': {
+      device: 'attached',
+      app: 'android.debug'
+    },
+    'android.att.release': {
+      device: 'attached',
+      app: 'android.release'
+    },
+    'android.emu.debug': {
+      device: 'emulator',
+      app: 'android.debug'
+    },
+    'android.emu.release': {
+      device: 'emulator',
+      app: 'android.release'
+    }
+  }
+};

example/.detoxrc.js

@@ -52,7 +52,6 @@ nonstrict-import=warn
 deprecated-type=warn
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
-signature-verification-failure=warn
 
 [strict]
 deprecated-type
@@ -64,4 +63,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.170.0
+^0.182.0

example/.flowconfig

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+ios/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -29,6 +30,7 @@ build/
 local.properties
 *.iml
 *.hprof
+.cxx/
 
 # node.js
 #
@@ -49,9 +51,10 @@ buck-out/
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
@@ -60,4 +63,4 @@ buck-out/
 /ios/Pods/
 /vendor/bundle/
 
-.watchman*
+/artifacts/

example/.gitignore

@@ -0,0 +1 @@
+16

example/.node-version

@@ -1 +1 @@
-2.7.4
+2.7.5

example/.ruby-version

@@ -143,6 +143,25 @@ const App = (): ReactElement => {
 					<Text style={styles.text}>{message}</Text>
 				</View>
 				<View style={styles.container}>
+					<Button
+						title={'E2E test'}
+						testID="E2ETest"
+						onPress={async (): Promise<void> => {
+							//TODO add more functionality to test
+							const ldkVersion = await ldk.version();
+							if (ldkVersion.isErr()) {
+								return setMessage(ldkVersion.error.message);
+							}
+
+							const nodeIdRes = await ldk.nodeId();
+							if (nodeIdRes.isErr()) {
+								return setMessage(nodeIdRes.error.message);
+							}
+
+							return setMessage('e2e success');
+						}}
+					/>
+
 					<Button
 						title={'Rebroadcast Known Transactions'}
 						onPress={async (): Promise<void> => {
@@ -511,24 +530,6 @@ const App = (): ReactElement => {
 						}}
 					/>
 
-					<Button
-						title={'E2E test'}
-						onPress={async (): Promise<void> => {
-							//TODO add more functionality to test
-							const ldkVersion = await ldk.version();
-							if (ldkVersion.isErr()) {
-								return setMessage(ldkVersion.error.message);
-							}
-
-							const nodeIdRes = await ldk.nodeId();
-							if (nodeIdRes.isErr()) {
-								return setMessage(nodeIdRes.error.message);
-							}
-
-							return setMessage('e2e success');
-						}}
-					/>
-
 					<Button
 						title={'Backup Current Account'}
 						onPress={async (): Promise<void> => {