fix

Kudo · Jun 30, 2024 · bb307e3 · bb307e3
1 parent 6706b85
commit bb307e3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/expo-android.yml b/.github/workflows/expo-android.yml
@@ -45,7 +45,6 @@ jobs:
       - name: Generate TestApp
         run: |
           bun link
-          cd ..
           bunx create-expo-app -t blank@@sdk-51 TestApp
           cd TestApp
           bun add v8-android-jit
@@ -54,7 +53,7 @@ jobs:
           echo 'if (global._v8runtime) { console.log(`=== V8 version[${global._v8runtime().version}] ===`); }' >> App.js
 
       - name: Build TestApp
-        working-directory: ../TestApp
+        working-directory: TestApp
         run: |
           npx expo prebuild -p android
           cd android
@@ -73,7 +72,7 @@ jobs:
           api-level: 34
           arch: x86_64
           target: google_apis
-          working-directory: ../TestApp/android
+          working-directory: TestApp/android
           script: |
             adb install -r app/build/outputs/apk/release/app-release.apk
             adb logcat -c
@@ -85,7 +84,7 @@ jobs:
       - name: Collect failure files
         if: failure()
         run: |
-          cp ../TestApp/android/adb.log .
+          cp TestApp/android/adb.log .
 
       - name: Upload failed artifacts
         if: failure()

diff --git a/.github/workflows/expo-ios.yml b/.github/workflows/expo-ios.yml
@@ -40,7 +40,6 @@ jobs:
       - name: Generate TestApp
         run: |
           bun link
-          cd ..
           bunx create-expo-app -t blank@@sdk-51 TestApp
           cd TestApp
           bun add v8-ios
@@ -49,14 +48,14 @@ jobs:
           echo 'if (global._v8runtime) { console.log(`=== V8 version[${global._v8runtime().version}] ===`); }' >> App.js
 
       - name: Build TestApp
-        working-directory: ../TestApp
+        working-directory: TestApp
         run: |
           npx expo prebuild -p ios
           cd ios
           xcodebuild -workspace ./TestApp.xcworkspace -scheme TestApp -configuration Release -derivedDataPath ./build -destination 'generic/platform=iOS Simulator' build | xcpretty
 
       - name: Run TestApp
-        working-directory: ../TestApp/ios
+        working-directory: TestApp/ios
         run: |
           SIMUDID=$(xcrun simctl list devices available -j | jq -r '.devices."com.apple.CoreSimulator.SimRuntime.iOS-17-5"[] | select(.name=="iPhone 15 Pro") | .udid')
           echo "Using simulator udid[${SIMUDID}]"
@@ -72,7 +71,7 @@ jobs:
       - name: Collect failure files
         if: failure()
         run: |
-          cp ../TestApp/ios/sim.log .
+          cp TestApp/ios/sim.log .
 
       - name: Upload failed artifacts
         if: failure()

diff --git a/scripts/gen_project.py b/scripts/gen_project.py
@@ -48,15 +48,15 @@ def main():
     subprocess.run(
         ["bun", "link"],
     )
-    print(["bunx", "@react-native-community/cli", "init", args.project_dir, "--version", args.rn_version])
     subprocess.run(
-        ["bunx", "@react-native-community/cli", "init", args.project_dir, "--version", args.rn_version]
+        ["npx", "@react-native-community/cli", "init", args.project_dir, "--pm", "bun", "--version", args.rn_version]
     )
 
     os.chdir(args.project_dir)
     subprocess.run(["bun", "add", args.v8_android_variant])
 
     if not args.npm_source:
+        assert install_tarball
         subprocess.run(
             [
                 "bun",