Skip to content

Commit

Permalink
Upgrade to Ruby 3.2.2 and Rails 7.0.1 (#960)
Browse files Browse the repository at this point in the history
Co-authored-by: JP Engstrom <jpengstrom@vpn1722513720.its.yale.internal>
Co-authored-by: JP Engstrom <jpengstrom@vpn1722516996.its.yale.internal>
Co-authored-by: JP Engstrom <jpengstrom@macbook-pro.lan>
  • Loading branch information
4 people authored Feb 28, 2024
1 parent e881ab5 commit 97a79bf
Show file tree
Hide file tree
Showing 54 changed files with 739 additions and 483 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM yalelibraryit/dc-base:v1.4.2
FROM yalelibraryit/dc-base:v1.4.4
ENV NODE_OPTIONS="--openssl-legacy-provider"

COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
COPY ops/env.conf /etc/nginx/main.d/env.conf
Expand All @@ -22,6 +23,6 @@ COPY --chown=app . $APP_HOME
# cached pages / assets to be kept and cleaned the way Rails expects them to be while keeping deployment very fast.
# The assets/packs get copied back by rsync on app load (see ops/nginx.sh)
RUN /sbin/setuser app bash -l -c " \
DB_ADAPTER=nulldb bundle exec rake assets:precompile && \
DB_ADAPTER=nulldb yarn install && bundle exec rake assets:precompile && \
mv ./public/assets ./public/assets-new && \
mv ./public/packs ./public/packs-new"
21 changes: 11 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
gem 'awesome_print'
gem "aws-sdk-cloudwatch"
gem 'aws-sdk-s3'
gem 'blacklight', '>= 7.33'
gem 'blacklight-gallery', '~> 2.1.0'
gem 'blacklight-marc', '>= 7.0.0.rc1', '< 8'
gem 'blacklight', '~> 7.36.2'
gem "blacklight_advanced_search"
gem 'blacklight_dynamic_sitemap'
gem 'blacklight_iiif_search'
gem 'blacklight-gallery', '~> 4.0.2'
gem 'blacklight_iiif_search', git: 'https://github.com/yalelibrary/blacklight_iiif_search', branch: 'main'
gem 'blacklight-marc', '>= 7.0.0.rc1', '< 8'
gem 'blacklight_oai_provider', git: 'https://github.com/projectblacklight/blacklight_oai_provider.git'
gem 'blacklight_range_limit'
gem 'bootsnap', '>= 1.4.2', require: false
Expand All @@ -33,18 +33,19 @@ gem 'openseadragon'
gem 'partridge', '~> 0.1.2'
gem 'pg'
gem 'puma', '~> 5.6'
gem 'rails', '~> 6.1.7.4'
gem 'rails', '~> 7.0.1'
gem "rails_semantic_logger", ">=4.4.4"
gem 'rsolr', '>= 1.0', '< 3'
gem 'sass-rails', '>= 6'
gem 'sprockets-rails'
gem 'turbolinks', '~> 5'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'webpacker', '~> 4.0'
gem 'yard'

group :development, :test do
gem 'bixby', '~> 3.0.0'
gem 'bixby', '~> 5.0.1'
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'rspec-rails', '~> 5.0.0'
gem 'solr_wrapper', '>= 0.3'
Expand All @@ -54,8 +55,8 @@ group :development do
gem 'activerecord-nulldb-adapter'
gem "amazing_print", ">=1.2.1"
gem 'listen', '~> 3.2'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'spring', '~> 4.1'
gem 'spring-watcher-listen'
gem 'web-console', '>= 3.3.0'
end

Expand All @@ -65,9 +66,9 @@ group :test do
gem 'capybara', '>= 2.15'
gem 'coveralls_reborn', require: false
gem 'factory_bot_rails'
gem 'ffaker'
gem 'ffaker', '2.20.0'
gem 'rails-controller-testing'
gem 'selenium-webdriver'
gem 'selenium-webdriver', '~> 4.16'
gem 'webdrivers', require: false
gem 'webmock'
end
Loading

0 comments on commit 97a79bf

Please sign in to comment.