Skip to content

Commit

Permalink
Merge pull request #217 from bizz84/feature/add-xcpretty
Browse files Browse the repository at this point in the history
Feature/add xcpretty
  • Loading branch information
bizz84 authored May 18, 2017
2 parents 96c3d6e + faf64b5 commit 08a0259
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ profile
*.moved-aside
DerivedData
.idea/
xcodebuild.log
# Pods - for those of you who use CocoaPods
Pods
# emacs
Expand Down
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: objective-c
osx_image: xcode8.3
#before_install:
# - rvm get stable

before_install:
- gem install xcpretty
# - rvm get stable

install:
- ./scripts/install_swiftlint.sh
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

All notable changes to this project will be documented in this file.

## [WIP] 0.10.1 Danger integration
## [WIP] 0.10.1 Danger, xcpretty integration

* Adds Danger for better Pull Request etiquette
* Adds Danger for better Pull Request etiquette ([#215](https://github.com/bizz84/SwiftyStoreKit/pull/215)).
* Adds xcpretty to improve build logs ([#217](https://github.com/bizz84/SwiftyStoreKit/pull/217))

## [0.10.0](https://github.com/bizz84/SwiftyStoreKit/releases/tag/0.10.0) `verifyReceipt` now automatically refreshes the receipt if needed

Expand Down
27 changes: 23 additions & 4 deletions scripts/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
#!/bin/bash
bold=$(tput bold)
normal=$(tput sgr0)

xcodebuild -project SwiftyStoreKit.xcodeproj -target SwiftyStoreKit_iOS
xcodebuild -project SwiftyStoreKit.xcodeproj -target SwiftyStoreKit_macOS
xcodebuild -project SwiftyStoreKit.xcodeproj -target SwiftyStoreKit_tvOS
echo "${bold}/*****************************/"
echo "/* Build: SwiftyStoreKit_iOS */"
echo "/*****************************/${normal}"
set -o pipefail && xcodebuild -project SwiftyStoreKit.xcodeproj -target SwiftyStoreKit_iOS | tee xcodebuild.log | xcpretty

xcodebuild test -project SwiftyStoreKit.xcodeproj -scheme SwiftyStoreKitTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3'
echo ""
echo "${bold}/*******************************/"
echo "/* Build: SwiftyStoreKit_macOS */"
echo "/*******************************/${normal}"
set -o pipefail && xcodebuild -project SwiftyStoreKit.xcodeproj -target SwiftyStoreKit_macOS | tee xcodebuild.log | xcpretty

echo ""
echo "${bold}/******************************/"
echo "/* Build: SwiftyStoreKit_tvOS */"
echo "/******************************/${normal}"
set -o pipefail && xcodebuild -project SwiftyStoreKit.xcodeproj -target SwiftyStoreKit_tvOS | tee xcodebuild.log | xcpretty

echo ""
echo "${bold}/****************************/"
echo "/* Run: SwiftyStoreKitTests */"
echo "/****************************/${normal}"
set -o pipefail && xcodebuild test -project SwiftyStoreKit.xcodeproj -scheme SwiftyStoreKitTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' | tee xcodebuild.log | xcpretty

0 comments on commit 08a0259

Please sign in to comment.