From b0d79bbd1493d790527728e91303aea9d3dd425a Mon Sep 17 00:00:00 2001 From: Ghassan Maslamani Date: Tue, 15 Aug 2023 10:00:08 +0200 Subject: [PATCH] feat: upgrade dependencies and ruby minor version --- .github/workflows/ci.yml | 9 +++-- Gemfile3 | 2 +- Gemfile3.lock | 72 +++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e06f417ea..add1a4fa68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - ruby-version: ['2.5.7', '3.0.4'] + ruby-version: ['2.5.7', '3.0.6'] mongodb-version: ['4.2.14'] include: - ruby-version: 2.5.7 gemfile: Gemfile allow-failure: false - - ruby-version: 3.0.4 + - ruby-version: 3.0.6 gemfile: Gemfile3 allow-failure: false env: @@ -52,13 +52,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - + - name: Set up Ruby ${{ matrix.ruby-version }} uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true - + - name: Install dependencies run: bundle install diff --git a/Gemfile3 b/Gemfile3 index 3e13228eb8..1e4d3754fc 100644 --- a/Gemfile3 +++ b/Gemfile3 @@ -36,7 +36,7 @@ gem 'mongoid_magic_counter_cache' # function 'handle_threads_query'. gem 'will_paginate_mongoid', "~>2.0" gem 'rdiscount' -gem 'nokogiri', "~> 1.8.1" +gem 'nokogiri', "~> 1.15.4" gem 'elasticsearch', '~> 7.8.0' gem 'elasticsearch-model', '~> 7.1.0' diff --git a/Gemfile3.lock b/Gemfile3.lock index 15ac092271..370dd7ce44 100644 --- a/Gemfile3.lock +++ b/Gemfile3.lock @@ -16,14 +16,14 @@ GIT GEM remote: https://rubygems.org/ specs: - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activesupport (7.0.4.3) + activemodel (7.0.7) + activesupport (= 7.0.7) + activesupport (7.0.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) bson (4.15.0) bson_ext (1.5.1) @@ -33,7 +33,7 @@ GEM concurrent-ruby (1.2.2) crack (0.4.5) rexml - dalli (3.2.4) + dalli (3.2.5) delayed_job (4.1.11) activesupport (>= 3.0, < 8.0) delayed_job_mongoid (3.0.0) @@ -55,11 +55,11 @@ GEM elasticsearch-transport (7.8.1) faraday (~> 1) multi_json - enumerize (2.6.1) + enumerize (2.7.0) activesupport (>= 3.2) factory_bot (6.2.1) activesupport (>= 5.0.0) - faker (3.2.0) + faker (3.2.1) i18n (>= 1.8.11, < 2) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -102,22 +102,21 @@ GEM http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) kgio (2.11.4) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lumberjack (1.2.8) + lumberjack (1.2.9) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.0) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - mini_portile2 (2.3.0) - minitest (5.18.0) - mongo (2.18.2) + mime-types-data (3.2023.0808) + minitest (5.19.0) + mongo (2.19.1) bson (>= 4.14.1, < 5.0.0) - mongoid (7.5.2) + mongoid (7.5.3) activemodel (>= 5.1, < 7.1, != 7.0.0) mongo (>= 2.10.5, < 3.0.0) ruby2_keywords (~> 0.0.5) @@ -132,9 +131,13 @@ GEM ruby2_keywords (~> 0.0.1) nenv (0.3.0) netrc (0.11.0) - newrelic_rpm (9.2.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + newrelic_rpm (9.3.1) + nokogiri (1.15.4-aarch64-linux) + racc (~> 1.4) + nokogiri (1.15.4-arm64-darwin) + racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) @@ -145,10 +148,11 @@ GEM method_source (~> 1.0) pry-nav (1.0.0) pry (>= 0.9.10, < 0.15) - public_suffix (5.0.1) - rack (2.2.6.4) - rack-protection (3.0.6) - rack + public_suffix (5.0.3) + racc (1.7.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) @@ -157,13 +161,13 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdiscount (2.2.7) + rdiscount (2.2.7.1) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) + rexml (3.2.6) rs_voteable_mongo (1.3.0) mongoid (~> 7.0) rspec (3.12.0) @@ -180,10 +184,10 @@ GEM rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-support (3.12.0) + rspec-support (3.12.1) ruby2_keywords (0.0.5) shellany (0.0.1) simplecov (0.21.2) @@ -192,16 +196,16 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sinatra (3.0.6) + sinatra (3.1.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) + rack-protection (= 3.1.0) tilt (~> 2.0) sinatra-param (1.6.0) sinatra (>= 1.3) - thor (1.2.1) - tilt (2.1.0) - timecop (0.9.6) + thor (1.2.2) + tilt (2.2.0) + timecop (0.9.8) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) @@ -247,7 +251,7 @@ DEPENDENCIES mongoid_cleaner (~> 1.2.0) mongoid_magic_counter_cache newrelic_rpm - nokogiri (~> 1.8.1) + nokogiri (~> 1.15.4) protected_attributes_continued pry pry-nav @@ -270,7 +274,7 @@ DEPENDENCIES yajl-ruby (~> 1.3.1) RUBY VERSION - ruby 3.0.4p208 + ruby 3.0.6p216 BUNDLED WITH - 2.3.4 + 2.4.18