Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hyacinth 3: Ruby 3.1, Solr 8, Docker updates, and gem updates #445

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['3.0.3']
ruby-version: ['3.1.4']
node: ['12']
env:
RAILS_ENV: test
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12
11 changes: 10 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ inherit_gem:
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 3.0.3
TargetRubyVersion: 3.1.4
TargetRailsVersion: 7.0.1
Exclude:
- 'bin/**/*'
- 'db/**/*'
- 'node_modules/**/*'
- 'script/**/*'
- 'spec/**/*'
- 'tmp/**/*'
- 'vendor/**/*'
- 'lib/tasks/**/*'

CUL/CapybaraScreenshots:
Description: 'Disallow calls to save_screenshot in feature specs.'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.3
3.1.4
21 changes: 3 additions & 18 deletions Capfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,14 @@ require 'capistrano/setup'
# Include default deployment tasks
require 'capistrano/deploy'

# Git SCM plugin
require 'capistrano/scm/git'
install_plugin Capistrano::SCM::Git

# Include tasks from other gems included in your Gemfile
#
# For documentation on these, see for example:
#
# https://github.com/capistrano/rvm
# https://github.com/capistrano/rbenv
# https://github.com/capistrano/chruby
# https://github.com/capistrano/bundler
# https://github.com/capistrano/rails
# https://github.com/capistrano/passenger
#
# additional modules
require 'capistrano/rails'
require 'capistrano/rvm'
require 'capistrano/passenger'

require 'capistrano/cul'

# require "capistrano/bundler"
# require "capistrano/rails/assets"
# require "capistrano/rails/migrations"

# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem 'graphql', '~> 2.0.0'
# Explicitly including io-wait dependency to match default version of the gem that comes with Ruby 3.0.
gem 'io-wait', '0.2.0'
gem 'json_csv', '~> 1.0.0'
gem 'nokogiri', '~> 1.10.10' # can't update to 1.11 because our server version of GLIBC is too old
gem 'nokogiri', '~> 1.15.5'
gem 'olive_branch', '~> 4.0.1'
gem 'puma', '~> 5.2'
gem 'rainbow', '~> 3.0'
Expand All @@ -42,11 +42,11 @@ group :development, :test do
end

group :development do
gem 'capistrano', '~> 3.17.0', require: false
# Use Capistrano for deployment
gem 'capistrano', '~> 3.18.0', require: false
gem 'capistrano-cul', require: false
gem 'capistrano-passenger', '~> 0.1', require: false
gem 'capistrano-rails', '~> 1.4', require: false
gem 'capistrano-rvm', '~> 0.1', require: false

gem 'graphiql-rails'

Expand All @@ -60,10 +60,10 @@ group :test do
gem 'json_spec'
gem 'rspec', '>= 3.11'
gem 'rspec-its'
gem 'rspec-rails', '~> 5.1'
gem 'selenium-webdriver', '~> 3.142'
gem 'rspec-rails', '~> 6.1'
gem 'simplecov', require: false
gem 'webdrivers', '~> 4.0', require: false
# For testing with chromedriver
gem 'selenium-webdriver', '~> 4.11'
gem 'webmock'
end

Expand Down
110 changes: 54 additions & 56 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
airbrussh (1.4.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.5.0)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
base64 (0.2.0)
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
best_type (0.0.10)
Expand All @@ -81,7 +82,7 @@ GEM
builder (3.2.4)
byebug (11.1.3)
cancancan (3.3.0)
capistrano (3.17.0)
capistrano (3.18.0)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand All @@ -101,19 +102,15 @@ GEM
capistrano-rails (1.6.2)
capistrano (~> 3.1)
capistrano-bundler (>= 1.1, < 3)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (3.36.0)
capybara (3.40.0)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
nokogiri (~> 1.11)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
childprocess (3.0.0)
concurrent-ruby (1.1.9)
crack (0.4.5)
rexml
Expand Down Expand Up @@ -179,14 +176,15 @@ GEM
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_mime (1.1.2)
mini_portile2 (2.4.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.15.0)
mono_logger (1.1.1)
msgpack (1.4.5)
multi_json (1.15.0)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0)
mysql2 (0.5.3)
net-imap (0.2.3)
digest
Expand All @@ -199,8 +197,8 @@ GEM
net-protocol (0.1.2)
io-wait
timeout
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.3.1)
digest
net-protocol
Expand All @@ -209,25 +207,27 @@ GEM
netrc (0.11.0)
nio4r (2.5.8)
noid (0.9.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
olive_branch (4.0.1)
multi_json
rails (>= 4.0)
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.1.2.0)
ast (~> 2.4.1)
public_suffix (4.0.6)
public_suffix (5.0.4)
puma (5.6.2)
nio4r (~> 2.0)
rack (2.2.3)
racc (1.7.3)
rack (2.2.8)
rack-protection (2.1.0)
rack
rack-proxy (0.7.2)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.2.3)
actioncable (= 7.0.2.3)
actionmailbox (= 7.0.2.3)
Expand Down Expand Up @@ -262,7 +262,7 @@ GEM
redis (4.6.0)
redis-namespace (1.8.2)
redis (>= 3.0.4)
regexp_parser (2.5.0)
regexp_parser (2.9.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
Expand All @@ -277,34 +277,34 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rexml (3.2.6)
rsolr (2.5.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-support (~> 3.12.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.11.0)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-rails (5.1.1)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.11.0)
rspec-support (~> 3.12.0)
rspec-rails (6.1.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.12)
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rubocop (1.31.2)
json (~> 2.3)
parallel (~> 1.10)
Expand Down Expand Up @@ -346,7 +346,7 @@ GEM
mime-types
nokogiri
rest-client
rubyzip (1.3.0)
rubyzip (2.3.2)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand All @@ -358,9 +358,11 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
selenium-webdriver (4.17.0)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
shakapacker (6.4.1)
activesupport (>= 5.2)
Expand All @@ -386,7 +388,8 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
sshkit (1.21.2)
sshkit (1.21.7)
mutex_m
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
strscan (3.0.1)
Expand All @@ -412,14 +415,11 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webdrivers (4.7.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (> 3.141, < 5.0)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket (1.2.10)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -435,11 +435,10 @@ DEPENDENCIES
bootsnap (>= 1.4.5)
byebug
cancancan (~> 3.3)
capistrano (~> 3.17.0)
capistrano (~> 3.18.0)
capistrano-cul
capistrano-passenger (~> 0.1)
capistrano-rails (~> 1.4)
capistrano-rvm (~> 0.1)
capybara (~> 3.35)
concurrent-ruby (~> 1.1.8)
devise (~> 4.7)
Expand All @@ -454,7 +453,7 @@ DEPENDENCIES
json_spec
mysql2 (~> 0.5)
noid (>= 0.7.1)
nokogiri (~> 1.10.10)
nokogiri (~> 1.15.5)
olive_branch (~> 4.0.1)
puma (~> 5.2)
rails (~> 7.0.2)
Expand All @@ -463,19 +462,18 @@ DEPENDENCIES
rsolr (~> 2.3)
rspec (>= 3.11)
rspec-its
rspec-rails (~> 5.1)
rspec-rails (~> 6.1)
rubocul (~> 4.0.5)
rubydora
sass-rails (~> 5.0)
selenium-webdriver (~> 3.142)
selenium-webdriver (~> 4.11)
shakapacker (= 6.4.1)
simplecov
sqlite3 (~> 1.4)
timecop (~> 0.9.1)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
webdrivers (~> 4.0)
webmock

BUNDLED WITH
Expand Down
Loading
Loading