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.

Sign up for GitHub

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

attempt to update ruby libs #3701

Merged
merged 9 commits into from
Aug 5, 2024
Merged

attempt to update ruby libs #3701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bdbb753
attempt to update ruby libs
johrstrom Jul 30, 2024
b2a446f
lock public_suffix
johrstrom Jul 30, 2024
d635684
lock capybara for ruby 2.7
johrstrom Jul 30, 2024
3226618
rm pbs gem
johrstrom Jul 30, 2024
fdcefb9
reorganize this dependency
johrstrom Jul 30, 2024
ea600e2
move mocha to test group
johrstrom Jul 30, 2024
377a710
lock public_suffix
johrstrom Jul 30, 2024
b91292b
Merge branch 'master' into update-ruby
johrstrom Aug 1, 2024
b21c34e
update to lock ffi
johrstrom Aug 1, 2024
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
14 changes: 8 additions & 6 deletions apps/dashboard/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,36 +26,40 @@ group :development, :test do
end

group :test do
gem "capybara"
# FIXME: capybara locked due to ruby 2.7 support.
gem 'capybara', '~> 3.39', '< 3.40'

# lock selenium as it doesn't work on ubuntu 22.04
# https://github.com/SeleniumHQ/selenium/issues/11291
gem "selenium-webdriver", '4.5.0'
gem "webrick"
gem 'mocha', '~> 2.1'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
# gem 'web-console', '~> 2.0'
end

# lock nokogiri & net-imap to versions that are compatible with ruby 2.7.0
# Ubuntu 20.04 uses.
# lock gems to versions that are compatible with ruby 2.7.0,
# which Ubuntu 20.04 uses.
gem 'nokogiri', '~> 1.15', '< 1.16'
gem 'net-imap', '~> 0.3', '< 0.4'
gem 'public_suffix', '~> 5.0', '< 6.0'

# Extra third-party gems
gem 'dotenv-rails', '~> 2.1'
gem 'redcarpet', '~> 3.3'
gem 'browser', '~> 2.2'
gem 'addressable', '~> 2.4'
gem 'bootstrap_form', '5.0'
gem 'mocha', '~> 2.1', group: :test
gem 'autoprefixer-rails', '~> 10.2.5'
gem 'dotiw'
gem 'local_time', '~> 1.0.3'
gem 'zip_kit', '~> 6.2'
gem 'rss', '~> 0.2'
gem 'climate_control', '~> 0.2'
gem 'rest-client', '~> 2.0'

gem 'jsbundling-rails', '~> 1.0'
gem 'cssbundling-rails', '~> 1.1'
Expand All @@ -68,8 +72,6 @@ gem 'sprockets-rails', '>= 2.0.0'
gem 'ood_support', '~> 0.0.2'
gem 'ood_appkit', '~> 2.1.0'
gem 'ood_core', '~> 0.24'
gem 'pbs', '~> 2.2.1'
gem 'rest-client', '~> 2.0'

# gems to include in ondemand-gems repo for status apps to use
gem "sinatra", require: false
Expand Down
64 changes: 31 additions & 33 deletions apps/dashboard/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
autoprefixer-rails (10.2.5.1)
execjs (> 0)
base64 (0.2.0)
bootstrap_form (5.0.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
browser (2.7.1)
builder (3.2.4)
builder (3.3.0)
byebug (11.1.3)
capybara (3.39.2)
addressable
Expand All @@ -96,9 +96,9 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
crass (1.0.6)
cssbundling-rails (1.4.0)
cssbundling-rails (1.4.1)
railties (>= 6.0.0)
dalli (3.2.8)
date (3.3.4)
Expand All @@ -110,20 +110,20 @@ GEM
dotiw (5.3.3)
activesupport
i18n
erubi (1.12.0)
erubi (1.13.0)
execjs (2.9.1)
ffi (1.16.3)
globalid (1.2.1)
activesupport (>= 6.1)
http-accept (1.7.0)
http-cookie (1.0.5)
http-cookie (1.0.6)
domain_name (~> 0.5)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jbuilder (2.11.5)
jbuilder (2.12.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jsbundling-rails (1.3.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
local_time (1.0.3)
coffee-rails
Expand All @@ -142,14 +142,14 @@ GEM
net-smtp
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
method_source (1.1.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0305)
mime-types-data (3.2024.0702)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
mocha (2.1.0)
mini_portile2 (2.8.7)
minitest (5.24.1)
mocha (2.4.5)
ruby2_keywords (>= 0.0.5)
multi_json (1.15.0)
mustermann (3.0.0)
Expand All @@ -164,7 +164,7 @@ GEM
net-smtp (0.5.0)
net-protocol
netrc (0.11.0)
nio4r (2.7.1)
nio4r (2.7.3)
nokogiri (1.15.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand All @@ -179,15 +179,13 @@ GEM
ood_support (~> 0.0.2)
rexml (~> 3.2)
ood_support (0.0.5)
pbs (2.2.1)
ffi (~> 1.9, >= 1.9.6)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.1.2)
stringio
public_suffix (5.0.5)
racc (1.7.3)
public_suffix (5.1.1)
racc (1.8.1)
rack (2.2.9)
rack-protection (3.2.0)
base64 (>= 0.1.0)
Expand Down Expand Up @@ -223,11 +221,11 @@ GEM
thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.2.1)
rdoc (6.6.3.1)
rdoc (6.7.0)
psych (>= 4.0.0)
redcarpet (3.6.0)
regexp_parser (2.9.0)
request_store (1.6.0)
regexp_parser (2.9.2)
request_store (1.7.0)
rack (>= 1.4)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand Down Expand Up @@ -261,30 +259,30 @@ GEM
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.1.0)
stringio (3.1.1)
strscan (3.1.0)
thor (1.3.1)
tilt (2.3.0)
timecop (0.9.8)
tilt (2.4.0)
timecop (0.9.10)
timeout (0.4.1)
turbo-rails (2.0.5)
turbo-rails (2.0.6)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
webrick (1.8.1)
websocket (1.2.10)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.13)
zeitwerk (2.6.17)
zip_kit (6.3.0)

PLATFORMS
Expand All @@ -296,7 +294,7 @@ DEPENDENCIES
bootstrap_form (= 5.0)
browser (~> 2.2)
byebug
capybara
capybara (~> 3.39, < 3.40)
climate_control (~> 0.2)
cssbundling-rails (~> 1.1)
dalli
Expand All @@ -312,8 +310,8 @@ DEPENDENCIES
ood_appkit (~> 2.1.0)
ood_core (~> 0.24)
ood_support (~> 0.0.2)
pbs (~> 2.2.1)
pry
public_suffix (~> 5.0, < 6.0)
rails (= 7.0.8.1)
redcarpet (~> 3.3)
rest-client (~> 2.0)
Expand Down
5 changes: 3 additions & 2 deletions apps/myjobs/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ gem 'climate_control', '~> 0.2'
# Psych::BadAlias: Cannot load database configuration: Unknown alias: default
gem 'rdoc', '6.3.4.1'

# lock nokogiri & net-imap to versions that are compatible with ruby 2.7.0
# Ubuntu 20.04 uses.
# lock gems to versions that are compatible with ruby 2.7.0,
# which Ubuntu 20.04 uses.
gem 'nokogiri', '~> 1.15', '< 1.16'
gem 'net-imap', '~> 0.3', '< 0.4'
gem 'public_suffix', '~> 5.0', '< 6.0'
45 changes: 23 additions & 22 deletions apps/myjobs/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
autoprefixer-rails (8.6.5)
execjs
base64 (0.2.0)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap_form (2.7.0)
builder (3.2.4)
builder (3.3.0)
byebug (11.1.3)
climate_control (0.2.0)
coffee-rails (4.2.2)
Expand All @@ -85,23 +85,23 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
crass (1.0.6)
date (3.3.4)
dotenv (2.8.1)
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
erubi (1.12.0)
erubi (1.13.0)
execjs (2.9.1)
ffi (1.16.3)
font-awesome-sass (5.15.1)
sassc (>= 1.11)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jbuilder (2.11.5)
jbuilder (2.12.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jquery-datatables-rails (3.4.0)
Expand Down Expand Up @@ -132,11 +132,11 @@ GEM
net-pop
net-smtp
marcel (1.0.4)
method_source (1.0.0)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.22.3)
mocha (2.1.0)
mini_portile2 (2.8.7)
minitest (5.24.1)
mocha (2.4.5)
ruby2_keywords (>= 0.0.5)
mustache (1.1.1)
net-imap (0.3.7)
Expand All @@ -148,7 +148,7 @@ GEM
timeout
net-smtp (0.5.0)
net-protocol
nio4r (2.7.1)
nio4r (2.7.3)
nokogiri (1.15.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand All @@ -171,8 +171,8 @@ GEM
rails (>= 5.0.0)
pbs (2.2.1)
ffi (~> 1.9, >= 1.9.6)
public_suffix (5.0.5)
racc (1.7.3)
public_suffix (5.1.1)
racc (1.8.1)
rack (2.2.9)
rack-test (2.1.0)
rack (>= 1.3)
Expand Down Expand Up @@ -210,11 +210,11 @@ GEM
zeitwerk (~> 2.5)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.3.4.1)
redcarpet (3.6.0)
request_store (1.6.0)
request_store (1.7.0)
rack (>= 1.4)
rexml (3.3.2)
strscan
Expand All @@ -238,15 +238,15 @@ GEM
base64
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
strscan (3.1.0)
thor (1.3.1)
tilt (2.3.0)
timecop (0.9.8)
tilt (2.4.0)
timecop (0.9.10)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand All @@ -255,7 +255,7 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.13)
zeitwerk (2.6.17)

PLATFORMS
ruby
Expand All @@ -280,6 +280,7 @@ DEPENDENCIES
ood_appkit (~> 2.0)
osc_machete_rails (~> 2.1.2)
pbs (~> 2.2.1)
public_suffix (~> 5.0, < 6.0)
rails (= 7.0.8.1)
rails-controller-testing
rdoc (= 6.3.4.1)
Expand Down
Loading