Skip to content

Commit

Permalink
Merge pull request #413 from Minitex/update-ruby
Browse files Browse the repository at this point in the history
Upgrade to Ruby 3.3.5
  • Loading branch information
swandog30 authored Nov 15, 2024
2 parents 6e115df + 2b1a475 commit 2bea2d4
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validate-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: '3.1.2'
ruby-version: '3.3.5'
- name: Install Dependencies Node
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.3.5
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ gem 'blacklight_advanced_search', '~> 7.0'
gem 'blacklight_range_limit', '~> 8.2.0'
gem 'blacklight-spotlight', '~> 3.4'
gem 'blacklight_oai_provider', '~> 7.0'
gem 'blacklight-gallery', '>= 0.3.0'
gem 'blacklight-oembed', '~> 1.1'

gem 'chosen-rails', '~> 1.9'
gem 'leaflet-rails'
gem 'rsolr', '~> 2.5'
Expand Down Expand Up @@ -92,13 +95,10 @@ gem 'redis-rails', '~> 5.0'

gem 'friendly_id'
gem 'sitemap_generator'
gem 'blacklight-gallery', '>= 0.3.0'
gem 'blacklight-oembed', '~> 1.1'

gem 'autoprefixer-rails', '~> 10.4.7' # Constraint to accommodate Node 8 on QA/Prod
gem 'kaltura-client'

gem 'sentry-ruby'
gem 'sentry-rails'
gem 'sentry-sidekiq'
gem 'strscan', '3.0.1'
20 changes: 8 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,13 @@ GEM
meta_request (0.7.3)
rack-contrib (>= 1.1, < 3)
railties (>= 3.0.0, < 7)
method_source (1.0.0)
method_source (1.1.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_magick (4.11.0)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
mini_portile2 (2.8.7)
minitest (5.19.0)
multi_json (1.15.0)
multi_xml (0.6.0)
Expand All @@ -431,8 +431,6 @@ GEM
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
oai (1.2.1)
builder (>= 3.1.0)
faraday (< 3)
Expand Down Expand Up @@ -460,17 +458,17 @@ GEM
protocol-http2 (0.14.2)
protocol-hpack (~> 1.4)
protocol-http (~> 0.18)
pry (0.13.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.9.0)
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry (>= 0.13, < 0.15)
pry-rails (0.3.11)
pry (>= 0.13.0)
public_suffix (5.0.0)
puma (3.12.6)
racc (1.7.1)
racc (1.8.1)
rack (2.2.8)
rack-contrib (2.3.0)
rack (~> 2.0)
Expand Down Expand Up @@ -661,7 +659,6 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
ssrf_filter (1.0.8)
strscan (3.0.1)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
Expand Down Expand Up @@ -789,7 +786,6 @@ DEPENDENCIES
sitemap_generator
spring
spring-watcher-listen (~> 2.0.0)
strscan (= 3.0.1)
thread-local
twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
uglifier (>= 1.3.0)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Install Ruby 3.1.2 via [rbenv](https://github.com/rbenv/rbenv)
```bash
brew install rbenv ruby-build
rbenv init
rbenv install 3.1.2
rbenv install 3.3.5
```

Install MySQL and Redis clients, as well as geckodriver for system tests run via Selenium.
Expand Down
2 changes: 1 addition & 1 deletion lib/mdl/archive_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

module MDL
class ArchiveGenerator
TMP_DIR = File.exists?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir
TMP_DIR = File.exist?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir

def self.call(identifier)
new(identifier).call
Expand Down
2 changes: 1 addition & 1 deletion lib/mdl/process_document_for_search.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module MDL
class ProcessDocumentForSearch
TMP_DIR = File.exists?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir
TMP_DIR = File.exist?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir
###
# Glue that connects an IIIF canvas, the image it represents,
# and the OCR process we need to perform.
Expand Down

0 comments on commit 2bea2d4

Please sign in to comment.