Skip to content

Commit 8e1ebc6

Browse files
meili-bors[bot]kobaltzcurquizabrunoocasali
authored
Merge #367
367: Update meilisearch-ruby to > v0.28 and deprecated ruby versions prior to 3 r=brunoocasali a=curquiza Since version [v0.27 of meilisearch-ruby](https://github.com/meilisearch/meilisearch-ruby/releases/tag/v0.27.0), the ruby 2.x is deprecated, so this PR updates all of the occurrences of the old ruby version. Co-authored-by: David Kimura <[email protected]> Co-authored-by: Clémentine <[email protected]> Co-authored-by: Bruno Casali <[email protected]>
2 parents e4037a5 + 2d730ec commit 8e1ebc6

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

.github/workflows/gempush.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ on:
88
jobs:
99
build:
1010
name: Build + Publish
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-latest
1212

1313
steps:
1414
- uses: actions/checkout@v4
15-
- name: Set up Ruby 2.7
15+
- name: Set up Ruby 3.2
1616
uses: ruby/setup-ruby@v1
1717
with:
18-
ruby-version: '2.7'
18+
ruby-version: '3.2'
1919
- name: Check release validity
2020
run: sh .github/scripts/check-release.sh
2121
- name: Publish to RubyGems

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
integration-tests:
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616
strategy:
1717
fail-fast: false
1818
matrix:

.github/workflows/tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
# Will not run if the event is a PR to bump-meilisearch-v* (so a pre-release PR)
1515
# Will still run for each push to bump-meilisearch-v*
1616
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-latest
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
ruby-version: ["2.7", "3.0", "3.1"]
21+
ruby-version: ["3.0", "3.1", "3.2"]
2222
rails-version: [6.1, 7.0]
2323
env:
2424
RAILS_VERSION: ${{ matrix.rails-version }}
@@ -42,15 +42,15 @@ jobs:
4242

4343
linter_check:
4444
name: linter-check
45-
runs-on: ubuntu-22.04
45+
runs-on: ubuntu-latest
4646
steps:
4747
- uses: actions/checkout@v4
4848
- name: Set up Ruby
4949
uses: ruby/setup-ruby@v1
5050
env:
5151
BUNDLE_WITH: test
5252
with:
53-
ruby-version: 2.6
53+
ruby-version: "3.0"
5454
bundler-cache: true
5555
- name: Run linter
5656
run: bundle exec rubocop lib/ spec/
@@ -67,7 +67,7 @@ jobs:
6767

6868
smoke-test:
6969
name: smoke-test
70-
runs-on: ubuntu-22.04
70+
runs-on: ubuntu-latest
7171
steps:
7272
- uses: actions/checkout@v4
7373
- name: Set up Ruby
@@ -76,7 +76,7 @@ jobs:
7676
BUNDLE_WITHOUT: test
7777
BUNDLE_GEMFILE: ./playground/Gemfile
7878
with:
79-
ruby-version: 2.6.9
79+
ruby-version: "3.0"
8080
bundler-cache: true
8181
- name: Meilisearch (latest) setup with Docker
8282
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key=masterKey --no-analytics

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM ruby:2.7
1+
FROM ruby:3
22

33
RUN apt-get update -y && apt-get install -y nodejs

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ This package guarantees compatibility with [version v1.x of Meilisearch](https:/
7676

7777
## 🔧 Installation <!-- omit in toc -->
7878

79-
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.
79+
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.
8080

8181
With `gem` in command line:
8282
```bash

bors.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
status = [
2+
'integration-tests (Rails 6.1 with Ruby 3.2)',
23
'integration-tests (Rails 6.1 with Ruby 3.1)',
34
'integration-tests (Rails 6.1 with Ruby 3.0)',
4-
'integration-tests (Rails 6.1 with Ruby 2.7)',
5-
'integration-tests (Rails 7 with Ruby 2.7)',
65
'integration-tests (Rails 7 with Ruby 3.0)',
76
'integration-tests (Rails 7 with Ruby 3.1)',
7+
'integration-tests (Rails 7 with Ruby 3.2)',
88
'linter-check',
9-
'smoke-test'
9+
'smoke-test',
1010
]
1111
# 1 hour timeout
1212
timeout-sec = 3600

meilisearch-rails.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
3232
'Rakefile'
3333
]
3434

35-
s.required_ruby_version = '>= 2.6.0'
35+
s.required_ruby_version = '>= 3.0.0'
3636

37-
s.add_dependency 'meilisearch', '~> 0.26.0'
37+
s.add_dependency 'meilisearch', '~> 0.28'
3838
end

playground/.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.2
1+
3.0

0 commit comments

Comments
 (0)