Merge pull request github-linguist#2955 from github/verify-licenses

Verify licenses on CI
octocat · Apr 16, 2016 · 8ea9632 · 8ea9632
2 parents c3145d3 + 03ef4f3
commit 8ea9632
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 254 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@ addons:
     - libicu-dev
     - libicu48
 before_install: script/travis/before_install
+script:
+  - bundle exec rake
+  - script/licensed verify
 rvm:
   - 2.0.0
   - 2.1

diff --git a/script/licensed b/script/licensed
@@ -36,8 +36,11 @@ source = Licensed::Source::Filesystem.new("vendor/grammars/*/", type: "grammar")
 config = Licensed::Configuration.new
 config.sources << source
 
-if ARGV[0] == "verify"
-  Licensed::Command::Verify.new(config).run
+command = if ARGV[0] == "verify"
+  Licensed::Command::Verify.new(config)
 else
-  Licensed::Command::Cache.new(config).run(force: true)
+  Licensed::Command::Cache.new(config)
 end
+
+command.run
+exit command.success?
diff --git a/vendor/licenses/config.yml b/vendor/licenses/config.yml
@@ -24,4 +24,4 @@ reviewed:
 
 sources:
   npm: false
-  rubygem: true
+  rubygem: false
diff --git a/vendor/licenses/grammar/prolog.tmbundle.txt b/vendor/licenses/grammar/prolog.tmbundle.txt
diff --git a/vendor/licenses/grammar/sublime-apl.txt b/vendor/licenses/grammar/sublime-apl.txt
diff --git a/vendor/licenses/rubygem/byebug.txt b/vendor/licenses/rubygem/byebug.txt
diff --git a/vendor/licenses/rubygem/charlock_holmes.txt b/vendor/licenses/rubygem/charlock_holmes.txt
diff --git a/vendor/licenses/rubygem/escape_utils.txt b/vendor/licenses/rubygem/escape_utils.txt
diff --git a/vendor/licenses/rubygem/github-linguist.txt b/vendor/licenses/rubygem/github-linguist.txt
diff --git a/vendor/licenses/rubygem/mime-types-data.txt b/vendor/licenses/rubygem/mime-types-data.txt
diff --git a/vendor/licenses/rubygem/mime-types.txt b/vendor/licenses/rubygem/mime-types.txt
diff --git a/vendor/licenses/rubygem/rugged.txt b/vendor/licenses/rubygem/rugged.txt