Skip to content

Commit 8379143

Browse files
committed
Merge pull request #4 from polydice/feature/danger-systems
Merge branch 'feature/danger-systems' into develop
2 parents 2b8e9db + 88638f0 commit 8379143

5 files changed

Lines changed: 79 additions & 8 deletions

File tree

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ language: objective-c
22
osx_image: xcode8
33
matrix:
44
include:
5-
- env: BUILD=9.3
6-
script: bundle exec rake ci:build[9.3]
7-
- env: BUILD=latest
8-
script: bundle exec rake ci:build[latest]
9-
- env: BUILD=carthage
10-
script: make carthage
5+
- env: VERSION=9.3
6+
- env: VERSION=latest
7+
before_script:
8+
- bundle exec danger
9+
script:
10+
- bundle exec rake ci:build[$VERSION]
11+
- make carthage
1112
after_script:
1213
- make documentation
1314
cache:
@@ -21,6 +22,8 @@ install:
2122
- make install
2223
before_script:
2324
- xcodebuild -workspace ICInputAccessory.xcworkspace -list
25+
script:
26+
- bundle exec rake ci:build[$VERSION]
2427
notifications:
2528
email: false
2629
slack:

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v1.3.0
2+
3+
#### Changes
4+
15
## v1.2.0
26

37
#### Changes
@@ -8,10 +12,9 @@
812

913
#### Changes
1014

15+
* Swift 2.2
1116
* Support storyboard
1217
* Support subspecs
13-
* Upgrade to Swift 2.2
14-
* Use CocoaPods (1.0.1)
1518

1619
## v1.0.0
1720

Dangerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/usr/bin/env ruby
2+
3+
# Sometimes it's a README fix, or something like that - which isn't relevant for
4+
# including in a project's CHANGELOG for example
5+
declared_trivial = github.pr_title.include? "#trivial"
6+
7+
# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
8+
warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
9+
10+
# Warn when there is a big PR
11+
warn("Big PR") if git.lines_of_code > 500
12+
13+
# Add a CHANGELOG entry for app changes
14+
if git.lines_of_code > 50 && !git.modified_files.include?("CHANGELOG.md") && !declared_trivial
15+
fail("Please update [CHANGELOG.md](https://github.com/polydice/ICInputAccessory/blob/develop/CHANGELOG.md).")
16+
end
17+
18+
# Ensure a clean commits history
19+
if git.commits.any? { |c| c.message =~ /^Merge branch/ }
20+
fail('Please rebase to get rid of the merge commits in this PR')
21+
end

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ source "http://rubygems.org"
22
ruby "2.3.1"
33

44
gem "cocoapods", "~> 1.0.0"
5+
gem "danger", "~> 3.4.0"
56
gem "jazzy", "~> 0.7.0"
67
gem "pry"
78
gem "rake"

Gemfile.lock

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ GEM
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9+
addressable (2.4.0)
910
claide (1.0.0)
11+
claide-plugins (0.9.2)
12+
cork
13+
nap
14+
open4 (~> 1.3)
1015
cocoapods (1.0.1)
1116
activesupport (>= 4.0.2)
1217
claide (>= 1.0.0, < 2.0)
@@ -41,9 +46,34 @@ GEM
4146
coderay (1.1.1)
4247
colored (1.2)
4348
concurrent-ruby (1.0.2)
49+
cork (0.2.0)
50+
colored (~> 1.2)
51+
danger (3.4.2)
52+
claide (~> 1.0)
53+
claide-plugins (> 0.9.0)
54+
colored (~> 1.2)
55+
cork (~> 0.1)
56+
faraday (~> 0.9)
57+
faraday-http-cache (~> 1.0)
58+
git (~> 1)
59+
gitlab (~> 3.7.0)
60+
kramdown (~> 1.5)
61+
octokit (~> 4.2)
62+
terminal-table (~> 1)
4463
escape (0.0.4)
64+
faraday (0.9.2)
65+
multipart-post (>= 1.2, < 3)
66+
faraday-http-cache (1.3.1)
67+
faraday (~> 0.8)
4568
fourflusher (0.3.2)
4669
fuzzy_match (2.0.4)
70+
git (1.3.0)
71+
gitlab (3.7.0)
72+
httparty (~> 0.13.0)
73+
terminal-table
74+
httparty (0.13.7)
75+
json (~> 1.8)
76+
multi_xml (>= 0.5.2)
4777
i18n (0.7.0)
4878
jazzy (0.7.2)
4979
cocoapods (~> 1.0)
@@ -54,13 +84,19 @@ GEM
5484
sass (~> 3.4)
5585
sqlite3 (~> 1.3)
5686
xcinvoke (~> 0.2.1)
87+
json (1.8.3)
88+
kramdown (1.12.0)
5789
liferaft (0.0.4)
5890
method_source (0.8.2)
5991
minitest (5.9.0)
6092
molinillo (0.4.5)
93+
multi_xml (0.5.5)
94+
multipart-post (2.0.0)
6195
mustache (0.99.8)
6296
nap (1.1.0)
6397
netrc (0.7.8)
98+
octokit (4.3.0)
99+
sawyer (~> 0.7.0, >= 0.5.3)
64100
open4 (1.3.4)
65101
pry (0.10.4)
66102
coderay (~> 1.1.0)
@@ -70,11 +106,17 @@ GEM
70106
redcarpet (3.3.4)
71107
rouge (1.11.1)
72108
sass (3.4.22)
109+
sawyer (0.7.0)
110+
addressable (>= 2.3.5, < 2.5)
111+
faraday (~> 0.8, < 0.10)
73112
slop (3.6.0)
74113
sqlite3 (1.3.11)
114+
terminal-table (1.7.3)
115+
unicode-display_width (~> 1.1.1)
75116
thread_safe (0.3.5)
76117
tzinfo (1.2.2)
77118
thread_safe (~> 0.1)
119+
unicode-display_width (1.1.1)
78120
xcinvoke (0.2.1)
79121
liferaft (~> 0.0.4)
80122
xcodeproj (1.3.1)
@@ -89,6 +131,7 @@ PLATFORMS
89131

90132
DEPENDENCIES
91133
cocoapods (~> 1.0.0)
134+
danger (~> 3.4.0)
92135
jazzy (~> 0.7.0)
93136
pry
94137
rake

0 commit comments

Comments
 (0)