Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add xcpretty #217

Merged
merged 7 commits into from
May 18, 2017
Merged

Feature/add xcpretty #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d8e144
Pipe build output with xcpretty
bizz84 May 18, 2017
532fa67
Include xcodebuild.log in .gitignore
bizz84 May 18, 2017
66635dc
Install xcpretty on Travis CI
bizz84 May 18, 2017
9a06e44
xcpretty to return same status code as xcodebuild
bizz84 May 18, 2017
df14458
Merge develop into feature/add-xcpretty
bizz84 May 18, 2017
c1683a8
Update CHANGELOG
bizz84 May 18, 2017
faf64b5
Make various build stages visible
bizz84 May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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