Skip to content

Commit

Permalink
Merge branch 'master' into danger-checks
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro Piñera Buendía authored Apr 30, 2018
2 parents 0726268 + de910dd commit 7217ddf
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ script:
- bundle exec rake ci
after_success:
- bundle exec rake deploy_to_integration
- bash <(curl -s https://codecov.io/bash)
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

### Added
- Update Danger to warn if the PR title contains WIP https://github.com/xcodeswift/xcproj/pull/259 by @pepibumur.
- Test coverage reports https://github.com/xcodeswift/xcproj/pull/258 by @pepibumur

## 4.3.0

Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ gem "cocoapods"
gem 'danger-xcodeswift', :git => "https://github.com/xcodeswift/danger", require: false
gem "git"
gem "rspec"
gem "xcpretty"
gem 'danger-swiftlint'
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<a href="https://opensource.org/licenses/MIT">
<img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="License" />
</a>
<a href="https://codecov.io/gh/xcodeswift/xcproj">
<img src="https://codecov.io/gh/xcodeswift/xcproj/branch/master/graph/badge.svg" />
</a>

xcproj is a library written in Swift for parsing and working with Xcode projects. It's heavily inspired in [CocoaPods XcodeProj](https://github.com/CocoaPods/Xcodeproj) and [xcode](https://www.npmjs.com/package/xcode).

Expand Down
6 changes: 4 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def git
end

def generate_docs
print "Executing tests"
print "Generating docs"
sh "swift package generate-xcodeproj"
sh "jazzy --clean --sdk macosx --xcodebuild-arguments -project,xcproj.xcodeproj,-scheme,xcproj-Package --skip-undocumented"
end
Expand Down Expand Up @@ -42,7 +42,7 @@ task :carthage do
end

def test_swift
sh "swift test --filter xcprojTests"
sh "xcodebuild -project xcproj.xcodeproj -scheme xcproj-Package -only-testing:xcprojTests -config Debug test -enableCodeCoverage YES"
end

def test_swift_integration
Expand Down Expand Up @@ -103,6 +103,8 @@ end

desc "Executes all the validation steps for CI"
task :ci do
print "Generate Xcode project"
sh "swift package generate-xcodeproj"
print "Linting project"
sh "swiftlint" if is_macos
print "CocoaPods linting"
Expand Down

0 comments on commit 7217ddf

Please sign in to comment.