Skip to content

Install SwiftLint via the install_contributor_tools script. #1145

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

Merged
merged 11 commits into from
Jan 10, 2017
Merged

Install SwiftLint via the install_contributor_tools script. #1145

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
75f4968
Install SwiftLint via the install_contributor_tools script.
ajsecord Jan 6, 2017
3cde0db
Merge branch 'develop' of github.com:material-components/material-com…
ajsecord Jan 10, 2017
8a00ad8
Exclude catalog/third_party from SwiftLint.
ajsecord Jan 10, 2017
12a6781
Added line length to .swiftlint.yml
ajsecord Jan 10, 2017
2c19802
Fixed SwiftLint warnings with some minor refactors.
ajsecord Jan 10, 2017
55ffa0b
Merge branch 'develop' of github.com:material-components/material-com…
ajsecord Jan 10, 2017
e8f1a99
Revert "Fixed SwiftLint warnings with some minor refactors."
ajsecord Jan 10, 2017
2bbd506
Revert "Added line length to .swiftlint.yml"
ajsecord Jan 10, 2017
0e6f75f
Revert "Exclude catalog/third_party from SwiftLint."
ajsecord Jan 10, 2017
a1bd200
Merge remote-tracking branch 'upstream/develop' into fix-swiftlint-tr…
ajsecord Jan 10, 2017
cd9983e
Merge branch 'fix-swiftlint-travis' of github.com:ajsecord/material-c…
ajsecord Jan 10, 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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ env:
- DESTINATION="platform=iOS Simulator,name=iPhone 7,OS=10.2" SDK="iphonesimulator10.2"
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
- brew update
- brew install swiftlint || true # If already installed, don't fail.
- scripts/install_contributor_tools
Copy link
Contributor

@randallli randallli Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesn't seem to match up with the PR description

Copy link
Contributor Author

@ajsecord ajsecord Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused. That's (part of) what this script does?

Copy link
Contributor

@randallli randallli Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm reading it again it makes sense...

# The travis_wait prefix ensures that the build doesn't error out because too much time went past
# without any output being produced.
script:
Expand Down