Skip to content

Commit

Permalink
CI: update to ruby 2.4.1 and rubocop 0.49
Browse files Browse the repository at this point in the history
Chef 13 is also using ruby 2.4.1 in the omnibus packages

Signed-off-by: Artem Sidorenko <[email protected]>
  • Loading branch information
artem-sidorenko committed Jun 2, 2017
1 parent 1465d62 commit a8f5bd3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
language: ruby
cache: bundler
rvm:
- 2.3.3
- 2.4.1

bundler_args: --without integration
script: bundle exec rake
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'highline', '~> 1.6.0'
gem 'inspec', '~> 1'
gem 'rack', '1.6.4'
gem 'rake'
gem 'rubocop', '~> 0.46.0'
gem 'rubocop', '~> 0.49.0'

group :tools do
gem 'github_changelog_generator', '~> 1.12.0'
Expand Down
1 change: 0 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/usr/bin/env rake
# encoding: utf-8

require 'rake/testtask'
Expand Down
6 changes: 3 additions & 3 deletions libraries/ssh_crypto.rb
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ def valid_privseparation

# return a list of valid algoriths for a current platform
def valid_algorithms # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
alg53 = %w(rsa)
alg60 = %w(rsa ecdsa)
alg66 = %w(rsa ecdsa ed25519)
alg53 = %w[rsa]
alg60 = %w[rsa ecdsa]
alg66 = %w[rsa ecdsa ed25519]
alg = alg66 # probably its a best suitable set for everything unknown

case inspec.os[:name]
Expand Down

0 comments on commit a8f5bd3

Please sign in to comment.