Merge pull request #562 from olleolleolle/fix/use-jruby-9-1-13-0
Travis: use JRuby 9.1.13.0; don't redo rvm's job
This commit is contained in:
commit
ada39f9735
|
@ -26,7 +26,7 @@ Metrics/ClassLength:
|
||||||
Metrics/MethodLength:
|
Metrics/MethodLength:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
Style/FileName:
|
Naming/FileName:
|
||||||
Exclude:
|
Exclude:
|
||||||
- 'bin/git-generate-changelog'
|
- 'bin/git-generate-changelog'
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ Metrics/AbcSize:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# Offense count: 1
|
# Offense count: 1
|
||||||
Style/AccessorMethodName:
|
Naming/AccessorMethodName:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# Offense count: 10
|
# Offense count: 10
|
||||||
|
@ -75,3 +75,8 @@ Style/SafeNavigation:
|
||||||
Metrics/BlockLength:
|
Metrics/BlockLength:
|
||||||
Exclude:
|
Exclude:
|
||||||
- 'spec/**/*'
|
- 'spec/**/*'
|
||||||
|
|
||||||
|
# Re-enable when merged; https://github.com/bbatsov/rubocop/pull/4756
|
||||||
|
Lint/InterpolationCheck:
|
||||||
|
Enabled: false
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ language: ruby
|
||||||
cache:
|
cache:
|
||||||
- bundler
|
- bundler
|
||||||
before_install:
|
before_install:
|
||||||
- gem update --system
|
|
||||||
- gem install bundler
|
- gem install bundler
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
|
@ -15,7 +14,7 @@ matrix:
|
||||||
gemfile: spec/install-gem-in-bundler.gemfile
|
gemfile: spec/install-gem-in-bundler.gemfile
|
||||||
- rvm: 2.3.4
|
- rvm: 2.3.4
|
||||||
- rvm: 2.4.1
|
- rvm: 2.4.1
|
||||||
- rvm: jruby-9.1.12.0
|
- rvm: jruby-9.1.13.0
|
||||||
jdk: oraclejdk8
|
jdk: oraclejdk8
|
||||||
env:
|
env:
|
||||||
- JRUBY_OPTS=--debug
|
- JRUBY_OPTS=--debug
|
||||||
|
@ -26,6 +25,7 @@ matrix:
|
||||||
- DEBUG=1
|
- DEBUG=1
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- rvm: jruby-head
|
- rvm: jruby-head
|
||||||
|
fast_finish: true
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
code_climate:
|
code_climate:
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -10,7 +10,7 @@ group :development, :test do
|
||||||
gem "bundler"
|
gem "bundler"
|
||||||
gem "overcommit", ">= 0.31"
|
gem "overcommit", ">= 0.31"
|
||||||
gem "rake"
|
gem "rake"
|
||||||
gem "rubocop", ">= 0.43"
|
gem "rubocop", ">= 0.50"
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# coding: utf-8
|
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
lib = File.expand_path("../lib", __FILE__)
|
lib = File.expand_path("../lib", __FILE__)
|
||||||
|
|
|
@ -78,7 +78,7 @@ module GitHubChangelogGenerator
|
||||||
issue["actual_date"] = commit["commit"]["author"]["date"]
|
issue["actual_date"] = commit["commit"]["author"]["date"]
|
||||||
|
|
||||||
# issue['actual_date'] = commit['author']['date']
|
# issue['actual_date'] = commit['author']['date']
|
||||||
rescue
|
rescue StandardError
|
||||||
puts "Warning: Can't fetch commit #{event['commit_id']}. It is probably referenced from another repo."
|
puts "Warning: Can't fetch commit #{event['commit_id']}. It is probably referenced from another repo."
|
||||||
issue["actual_date"] = issue["closed_at"]
|
issue["actual_date"] = issue["closed_at"]
|
||||||
end
|
end
|
||||||
|
|
|
@ -277,7 +277,7 @@ module GitHubChangelogGenerator
|
||||||
|
|
||||||
begin
|
begin
|
||||||
param = match[2].nil?
|
param = match[2].nil?
|
||||||
rescue
|
rescue StandardError
|
||||||
puts "Can't detect user and name from first parameter: '#{arg0}' -> exit'"
|
puts "Can't detect user and name from first parameter: '#{arg0}' -> exit'"
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
@ -48,7 +48,7 @@ module GitHubChangelogGenerator
|
||||||
return if non_configuration_line?(line)
|
return if non_configuration_line?(line)
|
||||||
option_name, value = extract_pair(line)
|
option_name, value = extract_pair(line)
|
||||||
@options[option_key_for(option_name)] = convert_value(value, option_name)
|
@options[option_key_for(option_name)] = convert_value(value, option_name)
|
||||||
rescue
|
rescue StandardError
|
||||||
raise ParserError, "Failed on line ##{line_number}: \"#{line.gsub(/[\n\r]+/, '')}\""
|
raise ParserError, "Failed on line ##{line_number}: \"#{line.gsub(/[\n\r]+/, '')}\""
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user