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

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
wrmswindmill committed Jul 30, 2019
1 parent 11dd0e5 commit bc05793
Show file tree
Hide file tree
Showing 4 changed files with 1,634 additions and 1,579 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ script:
;;
esac
hasAndroidFile=$(npm run danger -- run --dangerfile ./dangerfile-android.js)
hasAndroidFile=$(npm run danger -- run -i android --dangerfile ./dangerfile-android.js)
echo "The value of hasAndroidFile is ${hasAndroidFile}"
if [[ "$hasAndroidFile" =~ "hasAndroidFile" ]]; then
cd android
Expand All @@ -131,13 +131,13 @@ script:
fi
;;
"jsfm" )
npm run danger -- run --dangerfile ./dangerfile-jsfm.js
npm run danger -- run --dangerfile -i jsfm ./dangerfile-jsfm.js
;;
"danger" )
npm run danger -- run --dangerfile ./dangerfile.js
npm run danger -- run --dangerfile -i danger ./dangerfile.js
;;
"ios" )
hasIosFile=$(npm run danger -- run --dangerfile ./dangerfile-ios.js)
hasIosFile=$(npm run danger -- run -i ios --dangerfile ./dangerfile-ios.js)
echo "The value of hasIosFile is ${hasIosFile}"
if [[ "$hasIosFile" =~ "hasIosFile" ]]; then
# build WeexSDK and run WeexSDKTests
Expand All @@ -150,7 +150,7 @@ script:
esac
if [[ ("$TEST_SUITE" = "static_code_analysis") && ("${OCLINT}" = "true") ]]; then
hasCFile=$(npm run danger -- run --dangerfile ./dangerfile-static-check.js)
hasCFile=$(npm run danger -- run -i oclint --dangerfile ./dangerfile-static-check.js)
echo "The value of hasCFile is ${hasCFile}"
if [[ "$hasCFile" =~ "hasCFile" ]]; then
echo "hasCFile"
Expand All @@ -172,12 +172,12 @@ script:
-max-priority-2=15000 \
-max-priority-3=15000 > oclint.log
export COMMAND="cat ios/sdk/oclint.log | grep -i \"P[1|2]\""
cd ../../ && npm run danger -- run --dangerfile ./dangerfile-output.js
cd ../../ && npm run danger -- run -i oclintOutput --dangerfile ./dangerfile-output.js
fi
fi
if [[ ("$TEST_SUITE" = "static_code_analysis") && ("${ANDROID_LINT}" = "true") ]]; then
hasAndroidFile=$(npm run danger -- run --dangerfile ./dangerfile-static-check.js)
hasAndroidFile=$(npm run danger -- run -i androidLint --dangerfile ./dangerfile-static-check.js)
echo "The value of hasAndroidFile is ${hasAndroidFile}"
if [[ "$hasAndroidFile" =~ "hasAndroidFile" ]]; then
# format code using google-java-format at first
Expand All @@ -194,7 +194,7 @@ script:
if [[ ("$TEST_SUITE" = "code_format") ]]; then
echo "exec code format"
bundle exec danger
bundle exec danger --danger_id=dangerRuby
fi
notifications:
Expand Down
1 change: 1 addition & 0 deletions ios/sdk/WeexSDK/Sources/Bridge/JSContext+Weex.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
@property (nonatomic, strong) NSString *instanceId;

@end

Loading

0 comments on commit bc05793

Please sign in to comment.