Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Commit

Permalink
update android and ios
Browse files Browse the repository at this point in the history
  • Loading branch information
wrmswindmill committed Jul 22, 2019
1 parent 160b8aa commit e8321bc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
15 changes: 12 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ before_cache:

before_install:
- |
if [[ "${STATIC_CODE_ANALYSIS}" = "true" ]]; then
# install oclint
if [[ ("${STATIC_CODE_ANALYSIS}" = "true") && ("${CHECK_C}" = "true") ]]; then
brew cask uninstall oclint
brew tap oclint/formulae
brew install oclint
Expand All @@ -86,8 +87,12 @@ install:
export ANDROID_NDK_HOME=$HOME/android-ndk-r18b
export PATH=$PATH:$ANDROID_NDK_HOME
echo "ndk.dir=$ANDROID_NDK_HOME" > android/local.properties
elif [[ ("$TEST_SUITE" = "jsfm") || ("$TEST_SUITE" = "danger") || ("$TEST_SUITE" = "ios") || ("${CHECK_C}" = "true") ]]; then
elif [[ ("$TEST_SUITE" = "jsfm") || ("$TEST_SUITE" = "danger") || ("${CHECK_C}" = "true") ]]; then
npm install
elif [[ ("$TEST_SUITE" = "ios") ]] then
npm install
cd weex-playground/ios && pod install --repo-update
cd ../../
fi
script:
Expand Down Expand Up @@ -127,7 +132,10 @@ script:
hasIosFile=$(npm run danger -- run --dangerfile ./dangerfile-ios.js)
echo "The value of hasIosFile is ${hasIosFile}"
if [[ "$hasIosFile" =~ "hasIosFile" ]]; then
# build WeexSDK and run WeexSDKTests
xcodebuild -project ios/sdk/WeexSDK.xcodeproj test -scheme WeexSDKTests CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination "platform=iOS Simulator,name=iPhone 6"
# build WeexDemo and run WeexDemo test
xcodebuild -workspace weex-playground/ios/WeexDemo.xcworkspace test -scheme WeexDemo CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination "platform=iOS Simulator,name=iPhone 6"
fi
;;
esac
Expand Down Expand Up @@ -158,7 +166,8 @@ script:
if [[ ("${STATIC_CODE_ANALYSIS}" = "true") && ("${CHECK_ANDROID}" = "true") ]]; then
hasAndroidFile=$(npm run danger -- run --dangerfile ./dangerfile-static-check.js)
echo "The value of hasAndroidFile is ${hasAndroidFile}"
if [[ "$hasCFile" =~ "hasCFile" ]]; then
if [[ "$hasAndroidFile" =~ "hasAndroidFile" ]]; then
cd android
./gradlew clean assembleDebug test lint
fi
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ public Class<? extends WXComponent> getComponentClass(String name, String classN
}
}

}
}
2 changes: 1 addition & 1 deletion ios/sdk/WeexSDK/Sources/Model/WXComponent_performance.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
@property (nonatomic,assign) BOOL hasAdd;
@property (nonatomic,assign) BOOL ignoreInteraction;

@end
@end

0 comments on commit e8321bc

Please sign in to comment.