Skip to content

Commit 54e6bbc

Browse files
bors[bot]curquiza
andauthored
Merge #174
174: Add matrix for ruby versions in CI r=bidoubiwa a=curquiza - Use `ruby/ruby-setup` instead of `actions/ruby-setup` because deprecation - Add matrix to test several ruby versions in CIs - Update bors Co-authored-by: Clémentine Urquizar <[email protected]>
2 parents dd04960 + 7ba4cab commit 54e6bbc

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@ on:
1010

1111
jobs:
1212
integration_tests:
13-
name: integration-tests-against-rc
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
ruby-version: ['2.6', '2.7']
17+
name: integration-tests-against-rc (ruby ${{ matrix.ruby-version }})
1418
runs-on: ubuntu-latest
1519
steps:
1620
- uses: actions/checkout@v1
17-
- name: Set up Ruby 2.6
18-
uses: actions/setup-ruby@v1
21+
- name: Set up Ruby ${{ matrix.ruby-version }}
22+
uses: ruby/setup-ruby@v1
1923
with:
20-
ruby-version: 2.6.x
24+
ruby-version: ${{ matrix.ruby-version }}
2125
- name: Install ruby dependencies
2226
run: bundle install --with test
2327
- name: Get the latest MeiliSearch RC
24-
run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/master/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
28+
run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
2529
- name: MeiliSearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker
2630
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ env.MEILISEARCH_VERSION }} ./meilisearch --master-key=masterKey --no-analytics=true
2731
- name: Run test suite

.github/workflows/tests.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,21 @@ on:
1111

1212
jobs:
1313
integration_tests:
14-
name: integration-tests
1514
# Will not run if the event is a PR to bump-meilisearch-v* (so a pre-release PR)
1615
# Will still run for each push to bump-meilisearch-v*
1716
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
ruby-version: ['2.6', '2.7']
21+
name: integration-tests (ruby ${{ matrix.ruby-version }})
1822
runs-on: ubuntu-latest
1923
steps:
20-
- uses: actions/checkout@v1
21-
- name: Set up Ruby 2.6
22-
uses: actions/setup-ruby@v1
24+
- uses: actions/checkout@v2
25+
- name: Set up Ruby ${{ matrix.ruby-version }}
26+
uses: ruby/setup-ruby@v1
2327
with:
24-
ruby-version: 2.6.x
28+
ruby-version: ${{ matrix.ruby-version }}
2529
- name: Install ruby dependencies
2630
run: bundle install --with test
2731
- name: MeiliSearch (latest) setup with Docker
@@ -33,11 +37,11 @@ jobs:
3337
name: linter-check
3438
runs-on: ubuntu-latest
3539
steps:
36-
- uses: actions/checkout@v1
37-
- name: Set up Ruby 2.6
38-
uses: actions/setup-ruby@v1
40+
- uses: actions/checkout@v2
41+
- name: Set up Ruby
42+
uses: ruby/setup-ruby@v1
3943
with:
40-
ruby-version: 2.6.x
44+
ruby-version: 3.0
4145
- name: Install ruby dependencies
4246
run: bundle install --with test
4347
- name: Run linter

bors.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
status = ['integration-tests', 'linter-check']
1+
status = [
2+
'integration-tests (ruby 2.6)',
3+
'integration-tests (ruby 2.7)',
4+
'linter-check'
5+
]
26
# 1 hour timeout
37
timeout-sec = 3600

0 commit comments

Comments
 (0)