Skip to content

Commit

Permalink
Merge branch 'main' into refactor-integration-spec
Browse files Browse the repository at this point in the history
  • Loading branch information
brunoocasali authored Aug 7, 2024
2 parents cf8a17f + 40a6abb commit 487c780
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/gempush.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
integration-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -42,15 +42,15 @@ jobs:

linter_check:
name: linter-check
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
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/
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ruby:2.7
FROM ruby:3

RUN apt-get update -y && apt-get install -y nodejs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ This package guarantees compatibility with [version v1.x of Meilisearch](https:/

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

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
Expand Down
6 changes: 3 additions & 3 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion lib/meilisearch/rails/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module MeiliSearch
module Rails
VERSION = '0.13.0'
VERSION = '0.14.0'

def self.qualified_version
"Meilisearch Rails (v#{VERSION})"
Expand Down
4 changes: 2 additions & 2 deletions meilisearch-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.26.0'
s.add_dependency 'meilisearch', '~> 0.28'
end
2 changes: 1 addition & 1 deletion playground/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
3.0

0 comments on commit 487c780

Please sign in to comment.