From fa42ccb5d2bfd32021d67b75410a248ac455b0c4 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Wed, 7 Feb 2024 13:32:59 -0800 Subject: [PATCH 1/2] Update solr_wrapper --- .solr_wrapper.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 106 +++++++++++++++++++++++++++++----------------- 3 files changed, 68 insertions(+), 42 deletions(-) diff --git a/.solr_wrapper.yml b/.solr_wrapper.yml index 19de574..0774be5 100644 --- a/.solr_wrapper.yml +++ b/.solr_wrapper.yml @@ -2,5 +2,5 @@ collection: dir: <%= ENV['collection'] %> name: <%= ENV['collection'] %> -version: 8.8.0 +version: 8.11.2 port: 8983 diff --git a/Gemfile b/Gemfile index 94dc2c3..e592da3 100644 --- a/Gemfile +++ b/Gemfile @@ -6,5 +6,5 @@ group :test do gem 'rake' gem 'rspec' gem 'rubocop' - gem 'solr_wrapper', '~> 2.0' + gem 'solr_wrapper' end diff --git a/Gemfile.lock b/Gemfile.lock index 4369fd6..1a1fb6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,60 +1,86 @@ GEM remote: https://rubygems.org/ specs: + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - diff-lcs (1.5.0) - faraday (2.3.0) - faraday-net_http (~> 2.0) - ruby2_keywords (>= 0.0.4) - faraday-net_http (2.0.3) - json (2.6.2) - mini_portile2 (2.8.0) - nokogiri (1.13.8) - mini_portile2 (~> 2.8.0) + base64 (0.2.0) + diff-lcs (1.5.1) + domain_name (0.6.20240107) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http + ffi (1.16.3) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + http (5.2.0) + addressable (~> 2.8) + base64 (~> 0.1) + http-cookie (~> 1.0) + http-form_data (~> 2.2) + llhttp-ffi (~> 0.5.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + http-form_data (2.3.0) + json (2.7.1) + language_server-protocol (3.17.0.3) + llhttp-ffi (0.5.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + mini_portile2 (2.8.5) + minitar (0.9) + net-http (0.4.1) + uri + nokogiri (1.16.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - parallel (1.22.1) - parser (3.1.2.0) + parallel (1.24.0) + parser (3.3.0.5) ast (~> 2.4.1) - racc (1.6.0) + racc + public_suffix (5.0.4) + racc (1.7.3) rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.5.0) + rake (13.1.0) + regexp_parser (2.9.0) retriable (3.1.2) - rexml (3.2.5) - 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) + rexml (3.2.6) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - rubocop (1.32.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.0) + rubocop (1.60.2) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.19.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.19.1) - parser (>= 3.1.1.0) - ruby-progressbar (1.11.0) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - solr_wrapper (2.2.0) - faraday + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.13.0) + solr_wrapper (4.0.2) + http + minitar retriable ruby-progressbar - rubyzip - unicode-display_width (2.2.0) + unicode-display_width (2.5.0) + uri (0.13.0) PLATFORMS ruby @@ -65,7 +91,7 @@ DEPENDENCIES rake rspec rubocop - solr_wrapper (~> 2.0) + solr_wrapper BUNDLED WITH 2.1.4 From c14bb7b434f508b4f23109d77efeddcdc129b172 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Wed, 7 Feb 2024 13:34:49 -0800 Subject: [PATCH 2/2] Update ruby for CI --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 7806de2..5b2f68c 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.2 - name: Install dependencies run: bundle install - name: Run tests