Skip to content

Commit 616e582

Browse files
authored
Merge pull request #586 from Shopify/fix_ci
Update gems, fix ci setup
2 parents 942fee8 + 41d824d commit 616e582

File tree

3 files changed

+43
-37
lines changed

3 files changed

+43
-37
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
ruby: '3.0'
2020
gemfile: "Gemfile.min-supported"
2121
- name: 'Latest released & run rubocop'
22-
ruby: '3.3'
22+
ruby: '3.4'
2323
gemfile: "Gemfile.latest-release"
2424
rubocop: true
2525
- name: 'Rails edge'
26-
ruby: '3.3'
26+
ruby: '3.4'
2727
gemfile: "Gemfile.rails-edge"
2828
edge: true
2929

Gemfile.lock

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/Shopify/memcached.git
3-
revision: 54a89bae698896a00fd2ceeb142dada6285f73ed
3+
revision: 30f5735d5db2dfd50dd885ceeb51672320b356d3
44
branch: 1-0-stable-shopify
55
specs:
66
memcached (1.9.0)
@@ -15,14 +15,15 @@ PATH
1515
GEM
1616
remote: https://rubygems.org/
1717
specs:
18-
activemodel (7.2.0)
19-
activesupport (= 7.2.0)
20-
activerecord (7.2.0)
21-
activemodel (= 7.2.0)
22-
activesupport (= 7.2.0)
18+
activemodel (8.0.2)
19+
activesupport (= 8.0.2)
20+
activerecord (8.0.2)
21+
activemodel (= 8.0.2)
22+
activesupport (= 8.0.2)
2323
timeout (>= 0.4.0)
24-
activesupport (7.2.0)
24+
activesupport (8.0.2)
2525
base64
26+
benchmark (>= 0.3)
2627
bigdecimal
2728
concurrent-ruby (~> 1.0, >= 1.3.1)
2829
connection_pool (>= 2.2.5)
@@ -32,39 +33,42 @@ GEM
3233
minitest (>= 5.1)
3334
securerandom (>= 0.3)
3435
tzinfo (~> 2.0, >= 2.0.5)
36+
uri (>= 0.13.1)
3537
ar_transaction_changes (1.1.9)
3638
activerecord (>= 5.2.0)
37-
ast (2.4.2)
38-
base64 (0.2.0)
39-
bigdecimal (3.1.8)
40-
byebug (11.1.3)
39+
ast (2.4.3)
40+
base64 (0.3.0)
41+
benchmark (0.4.1)
42+
bigdecimal (3.2.2)
43+
byebug (12.0.0)
4144
cityhash (0.6.0)
42-
concurrent-ruby (1.3.4)
43-
connection_pool (2.4.1)
44-
dalli (3.2.3)
45-
drb (2.2.1)
46-
i18n (1.14.5)
45+
concurrent-ruby (1.3.5)
46+
connection_pool (2.5.3)
47+
dalli (3.2.8)
48+
drb (2.2.3)
49+
i18n (1.14.7)
4750
concurrent-ruby (~> 1.0)
48-
json (2.7.1)
49-
language_server-protocol (3.17.0.3)
50-
logger (1.6.0)
51+
json (2.13.1)
52+
language_server-protocol (3.17.0.5)
53+
logger (1.7.0)
5154
memcached_store (2.3.4)
5255
activesupport (>= 6)
5356
memcached (~> 1.8)
54-
minitest (5.25.1)
55-
mocha (2.1.0)
57+
minitest (5.25.5)
58+
mocha (2.7.1)
5659
ruby2_keywords (>= 0.0.5)
5760
mysql2 (0.5.6)
58-
parallel (1.24.0)
59-
parser (3.3.0.5)
61+
parallel (1.27.0)
62+
parser (3.3.9.0)
6063
ast (~> 2.4.1)
6164
racc
62-
pg (1.5.6)
63-
racc (1.7.3)
65+
pg (1.5.9)
66+
prism (1.4.0)
67+
racc (1.8.1)
6468
rainbow (3.1.1)
65-
rake (13.1.0)
66-
regexp_parser (2.9.0)
67-
rexml (3.3.9)
69+
rake (13.3.0)
70+
regexp_parser (2.10.0)
71+
rexml (3.4.1)
6872
rubocop (1.61.0)
6973
json (~> 2.3)
7074
language_server-protocol (>= 3.17.0)
@@ -76,19 +80,21 @@ GEM
7680
rubocop-ast (>= 1.30.0, < 2.0)
7781
ruby-progressbar (~> 1.7)
7882
unicode-display_width (>= 2.4.0, < 3.0)
79-
rubocop-ast (1.31.2)
80-
parser (>= 3.3.0.4)
83+
rubocop-ast (1.46.0)
84+
parser (>= 3.3.7.2)
85+
prism (~> 1.4)
8186
rubocop-shopify (2.9.0)
8287
rubocop (~> 1.33)
8388
ruby-progressbar (1.13.0)
8489
ruby2_keywords (0.0.5)
85-
securerandom (0.3.1)
90+
securerandom (0.4.1)
8691
spy (1.0.5)
87-
stackprof (0.2.26)
88-
timeout (0.4.1)
92+
stackprof (0.2.27)
93+
timeout (0.4.3)
8994
tzinfo (2.0.6)
9095
concurrent-ruby (~> 1.0)
91-
unicode-display_width (2.5.0)
96+
unicode-display_width (2.6.0)
97+
uri (1.0.3)
9298

9399
PLATFORMS
94100
arm64-darwin-22

test/cache_hash_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def test_memcache_hash
99
hash_val = IdentityCache.memcache_hash(random_str)
1010
assert(hash_val)
1111
assert_kind_of(Numeric, hash_val)
12-
assert_equal(0, (hash_val >> 64))
12+
assert_equal(0, hash_val >> 64)
1313
end
1414
end
1515
end

0 commit comments

Comments
 (0)