Skip to content

Commit ee1c082

Browse files
authored
ci: add ruby 3.2 to matrices (#184)
1 parent 880ecc1 commit ee1c082

File tree

2 files changed

+33
-17
lines changed

2 files changed

+33
-17
lines changed

.github/workflows/test.yaml

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Ruby
2929
uses: ruby/setup-ruby@v1
3030
with:
31-
ruby-version: '3.1'
31+
ruby-version: '3.2'
3232
bundler-cache: true
3333
- name: Run rubocop
3434
run: bundle exec rubocop
@@ -38,10 +38,20 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
redis: ['7.0.5', '6.2.7']
42-
ruby: ['3.1', '3.0', '2.7']
43-
driver: ['ruby', 'hiredis']
44-
docker: ['compose.yaml', 'compose.ssl.yaml']
41+
redis:
42+
- '7.0.5'
43+
- '6.2.7'
44+
ruby:
45+
- '3.2'
46+
- '3.1'
47+
- '3.0'
48+
- '2.7'
49+
driver:
50+
- 'ruby'
51+
- 'hiredis'
52+
docker:
53+
- 'compose.yaml'
54+
- 'compose.ssl.yaml'
4555
runs-on: ubuntu-latest
4656
env:
4757
REDIS_VERSION: ${{ matrix.redis }}
@@ -83,7 +93,7 @@ jobs:
8393
- name: Set up Ruby
8494
uses: ruby/setup-ruby@v1
8595
with:
86-
ruby-version: '3.1'
96+
ruby-version: '3.2'
8797
bundler-cache: true
8898
- name: Pull Docker images
8999
run: docker pull redis:$REDIS_VERSION
@@ -112,7 +122,7 @@ jobs:
112122
- name: Set up Ruby
113123
uses: ruby/setup-ruby@v1
114124
with:
115-
ruby-version: '3.1'
125+
ruby-version: '3.2'
116126
bundler-cache: true
117127
- name: Pull Docker images
118128
run: docker pull redis:$REDIS_VERSION
@@ -132,7 +142,9 @@ jobs:
132142
strategy:
133143
fail-fast: false
134144
matrix:
135-
redis: ['7.0.5', '6.2.7']
145+
redis:
146+
- '7.0.5'
147+
- '6.2.7'
136148
runs-on: ubuntu-latest
137149
env:
138150
REDIS_VERSION: ${{ matrix.redis }}
@@ -144,7 +156,7 @@ jobs:
144156
- name: Set up Ruby
145157
uses: ruby/setup-ruby@v1
146158
with:
147-
ruby-version: '3.1'
159+
ruby-version: '3.2'
148160
bundler-cache: true
149161
- name: Pull Docker images
150162
run: docker pull redis:$REDIS_VERSION
@@ -164,7 +176,9 @@ jobs:
164176
strategy:
165177
fail-fast: false
166178
matrix:
167-
redis: ['7.0.5', '6.2.7']
179+
redis:
180+
- '7.0.5'
181+
- '6.2.7'
168182
runs-on: ubuntu-latest
169183
env:
170184
REDIS_VERSION: ${{ matrix.redis }}
@@ -176,7 +190,7 @@ jobs:
176190
- name: Set up Ruby
177191
uses: ruby/setup-ruby@v1
178192
with:
179-
ruby-version: '3.1'
193+
ruby-version: '3.2'
180194
bundler-cache: true
181195
- name: Pull Docker images
182196
run: docker pull redis:$REDIS_VERSION
@@ -196,7 +210,9 @@ jobs:
196210
strategy:
197211
fail-fast: false
198212
matrix:
199-
redis: ['7.0.5', '6.2.7']
213+
redis:
214+
- '7.0.5'
215+
- '6.2.7'
200216
runs-on: ubuntu-latest
201217
env:
202218
REDIS_VERSION: ${{ matrix.redis }}
@@ -207,7 +223,7 @@ jobs:
207223
- name: Set up Ruby
208224
uses: ruby/setup-ruby@v1
209225
with:
210-
ruby-version: '3.1'
226+
ruby-version: '3.2'
211227
bundler-cache: true
212228
- name: Pull Docker images
213229
run: docker pull redis:$REDIS_VERSION
@@ -236,7 +252,7 @@ jobs:
236252
- name: Set up Ruby
237253
uses: ruby/setup-ruby@v1
238254
with:
239-
ruby-version: '3.1'
255+
ruby-version: '3.2'
240256
bundler-cache: true
241257
- name: Get IP address of host
242258
run: |
@@ -299,7 +315,7 @@ jobs:
299315
- name: Set up Ruby
300316
uses: ruby/setup-ruby@v1
301317
with:
302-
ruby-version: '3.1'
318+
ruby-version: '3.2'
303319
bundler-cache: true
304320
- name: Pull Docker images
305321
run: docker pull redis:$REDIS_VERSION
@@ -360,7 +376,7 @@ jobs:
360376
- name: Set up Ruby
361377
uses: ruby/setup-ruby@v1
362378
with:
363-
ruby-version: '3.1'
379+
ruby-version: '3.2'
364380
bundler-cache: true
365381
- name: Pull Docker images
366382
run: docker pull redis:$REDIS_VERSION

test/redis_client/test_cluster.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def test_blocking_call
6363
@client.call(*%w[RPUSH foo hello])
6464
@client.call(*%w[RPUSH foo world])
6565
wait_for_replication
66-
client_side_timeout = TEST_REDIS_MAJOR_VERSION < 6 ? 1.5 : 1.0
66+
client_side_timeout = TEST_REDIS_MAJOR_VERSION < 6 ? 2.0 : 1.5
6767
server_side_timeout = TEST_REDIS_MAJOR_VERSION < 6 ? '1' : '0.5'
6868
assert_equal(%w[foo world], @client.blocking_call(client_side_timeout, 'BRPOP', 'foo', server_side_timeout), 'Case: 1st')
6969
assert_equal(%w[foo hello], @client.blocking_call(client_side_timeout, 'BRPOP', 'foo', server_side_timeout), 'Case: 2nd')

0 commit comments

Comments
 (0)