Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

Commit

Permalink
Update to ruby 2.6 in CI and Gemfile
Browse files Browse the repository at this point in the history
  • Loading branch information
vincemtnz committed Apr 3, 2019
1 parent a12577a commit f6ae77c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
defaults: &defaults
working_directory: ~/circleci-champaign
docker:
- image: soutech/ruby2.4.5_node_awscli:latest
- image: soutech/ruby:2.6-stretch-node-awscli

jobs:
install_dependencies:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
rspec:
working_directory: ~/circleci-champaign
docker:
- image: soutech/ruby2.4.5_node_awscli:latest
- image: soutech/ruby:2.6-stretch-node-awscli
environment:
PG_USERNAME: champaign
PG_PASSWORD: champaign
Expand Down
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 2.4
TargetRubyVersion: 2.6
Exclude:
- 'bin/**/*'
- 'vendor/**/*'
Expand Down Expand Up @@ -46,7 +46,7 @@ Naming/VariableNumber:

Naming/MemoizedInstanceVariableName:
Enabled: false

Lint/HandleExceptions:
Enabled: false

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.5
2.6.2
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby '2.4.5'
ruby '2.6.2'

gem 'aasm'
gem 'activeadmin', '~> 1.4.3'
Expand Down Expand Up @@ -77,7 +77,7 @@ group :development, :test do
gem 'faker'
gem 'magic_lamp'
gem 'rspec-rails', '~> 3.8'
gem 'rubocop', require: false
gem 'rubocop', '~> 0.66', require: false
gem 'spring-commands-rspec'
gem 'vcr'
gem 'byebug'
Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ GEM
has_scope (~> 0.6)
railties (>= 4.2, < 5.3)
responders
jaro_winkler (1.5.1)
jaro_winkler (1.5.2)
jbuilder (2.6.4)
activesupport (>= 3.0.0)
multi_json (>= 1.2)
Expand Down Expand Up @@ -356,8 +356,8 @@ GEM
mime-types
mimemagic (~> 0.3.0)
terrapin (~> 0.6.0)
parallel (1.12.1)
parser (2.5.3.0)
parallel (1.17.0)
parser (2.6.2.0)
ast (~> 2.4.0)
pg (0.20.0)
phony (2.16.4)
Expand All @@ -368,10 +368,10 @@ GEM
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
powerpack (0.1.2)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
psych (3.1.0)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
Expand Down Expand Up @@ -455,14 +455,14 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.60.0)
rubocop (0.66.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-rspec (1.30.1)
rubocop (>= 0.60.0)
ruby-progressbar (1.10.0)
Expand Down Expand Up @@ -531,7 +531,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.4.0)
unicode-display_width (1.5.0)
unicode_utils (1.4.0)
vcr (3.0.3)
warden (1.2.8)
Expand Down Expand Up @@ -626,7 +626,7 @@ DEPENDENCIES
rmagick
rspec-json_expectations
rspec-rails (~> 3.8)
rubocop
rubocop (~> 0.66)
rubocop-rspec
sass-rails
sentry-raven
Expand All @@ -645,7 +645,7 @@ DEPENDENCIES
webpacker (~> 3.5)

RUBY VERSION
ruby 2.4.5p335
ruby 2.6.2p47

BUNDLED WITH
2.0.1

0 comments on commit f6ae77c

Please sign in to comment.