Skip to content

Commit

Permalink
Merge pull request #17 from AndreyZarembo/develop
Browse files Browse the repository at this point in the history
Develop To Master
  • Loading branch information
AndreyZarembo authored Apr 13, 2018
2 parents 19ef603 + 80846d0 commit 8d862e9
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode8.3
osx_image: xcode9.3
branches:
only:
- master
Expand All @@ -11,20 +11,12 @@ env:
- WORKSPACE=EasyDi.xcworkspace
- IOS_FRAMEWORK_SCHEME="EasyDi-iOS"
- MACOS_FRAMEWORK_SCHEME="EasyDi-macOS"
# - TVOS_FRAMEWORK_SCHEME="EasyDi-tvOS"
# - WATCHOS_FRAMEWORK_SCHEME="EasyDi-watchOS"
- EXAMPLE_SCHEME="iOS Example"
matrix:
#- DESTINATION="OS=3.2, name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"
#- DESTINATION="OS=2.0, name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"

- DESTINATION="OS=10.3.1,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
- DESTINATION="OS=9.0,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
- DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"

#- DESTINATION="OS=10.2, name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
#- DESTINATION="OS=9.0, name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"

# - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
- DESTINATION="OS=11.3,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
- DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
before_install:
- gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
Expand All @@ -48,9 +40,9 @@ script:
fi

# Build Example in Debug if specified
- if [ $BUILD_EXAMPLE == "YES" ]; then
xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
fi
# - if [ $BUILD_EXAMPLE == "YES" ]; then
# xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
# fi

# Run `pod lib lint` if specified
- if [ $POD_LINT == "YES" ]; then
Expand Down

0 comments on commit 8d862e9

Please sign in to comment.