From 4412d0581fd124d6fa1247bdb959f89a3518672c Mon Sep 17 00:00:00 2001 From: David Kimura Date: Tue, 28 May 2024 18:13:44 -0400 Subject: [PATCH 1/5] Update meilisearch-ruby version --- meilisearch-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meilisearch-rails.gemspec b/meilisearch-rails.gemspec index a78df335..27b69de9 100644 --- a/meilisearch-rails.gemspec +++ b/meilisearch-rails.gemspec @@ -34,5 +34,5 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6.0' - s.add_dependency 'meilisearch', '~> 0.26.0' + s.add_dependency 'meilisearch', '~> 0.27.0' end From 4cdfe4d792013e7e314cbb61c0d56ff84759a4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine?= Date: Wed, 10 Jul 2024 14:24:58 +0200 Subject: [PATCH 2/5] Update meilisearch-rails.gemspec --- meilisearch-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meilisearch-rails.gemspec b/meilisearch-rails.gemspec index 27b69de9..7da32417 100644 --- a/meilisearch-rails.gemspec +++ b/meilisearch-rails.gemspec @@ -34,5 +34,5 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6.0' - s.add_dependency 'meilisearch', '~> 0.27.0' + s.add_dependency 'meilisearch', '~> 0.28' end From 7ccf7d08bb8762d3dae642d3e3838ff8b9909309 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 10 Jul 2024 10:23:44 -0300 Subject: [PATCH 3/5] Update to ruby 3 --- meilisearch-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meilisearch-rails.gemspec b/meilisearch-rails.gemspec index 7da32417..b3f47801 100644 --- a/meilisearch-rails.gemspec +++ b/meilisearch-rails.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| 'Rakefile' ] - s.required_ruby_version = '>= 2.6.0' + s.required_ruby_version = '>= 3.0.0' s.add_dependency 'meilisearch', '~> 0.28' end From 49ecbdd3e8b19a2fe7405f9be6927feb313b8b41 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 10 Jul 2024 10:27:34 -0300 Subject: [PATCH 4/5] Deprecate ruby 2.7 from the CIs --- .github/workflows/tests.yml | 12 ++++++------ Dockerfile | 2 +- bors.toml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ef19a96..e599ed3a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,11 +14,11 @@ jobs: # Will not run if the event is a PR to bump-meilisearch-v* (so a pre-release PR) # Will still run for each push to bump-meilisearch-v* if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v') - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: - ruby-version: ["2.7", "3.0", "3.1"] + ruby-version: ["3.0", "3.1", "3.2"] rails-version: [6.1, 7.0] env: RAILS_VERSION: ${{ matrix.rails-version }} @@ -42,7 +42,7 @@ jobs: linter_check: name: linter-check - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Set up Ruby @@ -50,7 +50,7 @@ jobs: env: BUNDLE_WITH: test with: - ruby-version: 2.6 + ruby-version: "3.0" bundler-cache: true - name: Run linter run: bundle exec rubocop lib/ spec/ @@ -67,7 +67,7 @@ jobs: smoke-test: name: smoke-test - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Set up Ruby @@ -76,7 +76,7 @@ jobs: BUNDLE_WITHOUT: test BUNDLE_GEMFILE: ./playground/Gemfile with: - ruby-version: 2.6.9 + ruby-version: "3.0" bundler-cache: true - name: Meilisearch (latest) setup with Docker run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key=masterKey --no-analytics diff --git a/Dockerfile b/Dockerfile index 216013e9..5b708fd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM ruby:2.7 +FROM ruby:3 RUN apt-get update -y && apt-get install -y nodejs diff --git a/bors.toml b/bors.toml index a7b0b6b9..2f2206c1 100644 --- a/bors.toml +++ b/bors.toml @@ -1,12 +1,12 @@ status = [ + 'integration-tests (Rails 6.1 with Ruby 3.2)', 'integration-tests (Rails 6.1 with Ruby 3.1)', 'integration-tests (Rails 6.1 with Ruby 3.0)', - 'integration-tests (Rails 6.1 with Ruby 2.7)', - 'integration-tests (Rails 7 with Ruby 2.7)', 'integration-tests (Rails 7 with Ruby 3.0)', 'integration-tests (Rails 7 with Ruby 3.1)', + 'integration-tests (Rails 7 with Ruby 3.2)', 'linter-check', - 'smoke-test' + 'smoke-test', ] # 1 hour timeout timeout-sec = 3600 From 2d730eca4a74fc4cdd72540329d1f7fe5982cdfb Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 10 Jul 2024 10:29:19 -0300 Subject: [PATCH 5/5] Replace usage of ruby 2.7 everywhere --- .github/workflows/gempush.yml | 6 +++--- .github/workflows/pre-release-tests.yml | 2 +- README.md | 2 +- playground/.ruby-version | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gempush.yml b/.github/workflows/gempush.yml index b1861617..635c8155 100644 --- a/.github/workflows/gempush.yml +++ b/.github/workflows/gempush.yml @@ -8,14 +8,14 @@ on: jobs: build: name: Build + Publish - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Ruby 2.7 + - name: Set up Ruby 3.2 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.2' - name: Check release validity run: sh .github/scripts/check-release.sh - name: Publish to RubyGems diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml index e92a7629..d11e06cb 100644 --- a/.github/workflows/pre-release-tests.yml +++ b/.github/workflows/pre-release-tests.yml @@ -12,7 +12,7 @@ on: jobs: integration-tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: diff --git a/README.md b/README.md index f0a38b67..48eac9db 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ This package guarantees compatibility with [version v1.x of Meilisearch](https:/ ## 🔧 Installation -This package requires Ruby version 2.7.0 or later and Rails 6.1 or later. It may work in older versions but it is not officially supported. +This package requires Ruby version 3.0 or later and Rails 6.1 or later. It may work in older versions but it is not officially supported. With `gem` in command line: ```bash diff --git a/playground/.ruby-version b/playground/.ruby-version index 37c2961c..9f55b2cc 100644 --- a/playground/.ruby-version +++ b/playground/.ruby-version @@ -1 +1 @@ -2.7.2 +3.0