From bd04badbe8b1920078758d0936134433abbdd23d Mon Sep 17 00:00:00 2001 From: steven Date: Thu, 16 Mar 2023 21:45:04 +0800 Subject: [PATCH] feat: project init --- .github/workflows/e2e_android.yml | 2 +- Example/testHotUpdate/detox.config.js | 6 ++++-- ios/pushy_build_time.txt | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 34deea0..b6ed804 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -215,4 +215,4 @@ jobs: script: | $ANDROID_HOME/platform-tools/adb devices nohup sh -c "$ANDROID_HOME/platform-tools/adb logcat '*:D' > adb-log.txt" & - sudo yarn test:android-release + yarn test:android-release diff --git a/Example/testHotUpdate/detox.config.js b/Example/testHotUpdate/detox.config.js index 29f7587..a7d6218 100644 --- a/Example/testHotUpdate/detox.config.js +++ b/Example/testHotUpdate/detox.config.js @@ -21,12 +21,14 @@ module.exports = { type: 'ios.app', binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/testHotUpdate.app', - "build": "export RCT_NO_LAUNCH_PACKAGER=true && set -o pipefail | xcodebuild CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ -workspace ios/testHotUpdate.xcworkspace -scheme testHotUpdate -configuration Release -sdk iphonesimulator -derivedDataPath ios/build | xcbeautify", + build: + 'export RCT_NO_LAUNCH_PACKAGER=true && xcodebuild -workspace ios/testHotUpdate.xcworkspace -UseNewBuildSystem=NO -scheme testHotUpdate -configuration Release -sdk iphonesimulator -derivedDataPath ios/build -quiet', }, 'android.release': { type: 'android.apk', binaryPath: 'android/app/build/outputs/apk/release/app-release.apk', - build: "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ..", + build: + 'cd android ; ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release ; cd -', }, }, devices: { diff --git a/ios/pushy_build_time.txt b/ios/pushy_build_time.txt index 1e0e47d..11e0876 100644 --- a/ios/pushy_build_time.txt +++ b/ios/pushy_build_time.txt @@ -1 +1 @@ -1678943753 +1678953118 diff --git a/package.json b/package.json index 4cdd3ae..44c4d2b 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "build-lib": "yarn submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib", "build:ios-release": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.release", - "test:ios-release": "cd Example/testHotUpdate && detox test --configuration ios.sim.release", + "test:ios-release": "cd Example/testHotUpdate && SIMCTL_CHILD_GULGeneratedClassDisposeDisabled=1 ./node_modules/.bin/nyc yarn detox test --configuration ios.sim.release", "build:android-release": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.release", "test:android-release": "cd Example/testHotUpdate && ./node_modules/.bin/nyc yarn detox test --configuration android.emu.release", "e2e:ios": "npm run build:ios-release && npm run test:ios-release",