diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a367779d..634136f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,7 +153,7 @@ jobs: # run: | # yarn turbo run android --cache-dir="${{ env.TURBO_CACHE_DIR }}" - build-ios: + test-ios: runs-on: macos-latest env: TURBO_CACHE_DIR: .turbo/ios @@ -208,9 +208,13 @@ jobs: env: NO_FLIPPER: 1 - - name: Build example for iOS + # - name: Build example for iOS + # run: | + # yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" + + - name: run tests run: | - yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" + ./scripts/test-ios.sh build-ios-sqlcipher: runs-on: macos-latest diff --git a/example/package.json b/example/package.json index 4e7693d9..9fb80760 100644 --- a/example/package.json +++ b/example/package.json @@ -5,6 +5,7 @@ "scripts": { "android": "react-native run-android", "ios": "react-native run-ios --scheme='debug' --simulator='iPhone 15 Pro'", + "run:ios": "react-native run-ios --scheme='debug'", "start": "react-native start", "pods": "cd ios && bundle exec pod install", "pods:nuke": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install", diff --git a/scripts/test-android.sh b/scripts/test-android.sh index 04867bc0..55607b4c 100755 --- a/scripts/test-android.sh +++ b/scripts/test-android.sh @@ -1,8 +1,4 @@ JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run run:android:release --cache-dir=.turbo/android adb forward tcp:9000 tcp:9000 -# echo "🟦 Android device address:" -adb shell ip addr show -# echo "📱 Android Emulator IP Address:" -# adb shell ifconfig | grep "inet addr" | awk '{print $2}' | awk -F: '{print $2}' echo "Polling in-app server..." node ./scripts/poll-in-app-server.js \ No newline at end of file diff --git a/scripts/test-ios.sh b/scripts/test-ios.sh new file mode 100755 index 00000000..9a86db55 --- /dev/null +++ b/scripts/test-ios.sh @@ -0,0 +1,4 @@ +yarn turbo run run:ios --cache-dir=.turbo/ios + +echo "Polling in-app server..." +node ./scripts/poll-in-app-server.js \ No newline at end of file diff --git a/turbo.json b/turbo.json index 7e39912c..e274708e 100644 --- a/turbo.json +++ b/turbo.json @@ -1,21 +1,6 @@ { "$schema": "https://turbo.build/schema.json", "pipeline": { - "build:android": { - "inputs": [ - "package.json", - "android", - "!android/build", - "src/*.ts", - "src/*.tsx", - "example/package.json", - "example/android", - "!example/android/.gradle", - "!example/android/build", - "!example/android/app/build" - ], - "outputs": [] - }, "run:android:release": { "inputs": [ "package.json", @@ -31,7 +16,7 @@ ], "outputs": [] }, - "build:ios": { + "run:ios": { "inputs": [ "package.json", "*.podspec",