Skip to content

Commit a570a57

Browse files
authored
Merge pull request #635 from code0-tech/319-ruby-3-4-update
Update ruby to 3.4.7
2 parents 56198dc + 7d858d0 commit a570a57

File tree

7 files changed

+29
-16
lines changed

7 files changed

+29
-16
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ include:
1010
file: ci-template.gitlab-ci.yml
1111

1212
.bundle:
13-
image: ruby:3.2.2
13+
image: ruby:3.4.7
1414
before_script:
1515
- bundle install --jobs $(nproc)
1616

1717
.rails:
18-
image: ghcr.io/code0-tech/build-images/ruby-postgres:211.1-ruby-3.2.2-postgres-16.1
18+
image: ghcr.io/code0-tech/build-images/ruby-postgres:220.1-ruby-3.4.7-postgres-16.1
1919
before_script:
2020
- cp tooling/pipeline/sagittarius.yml config/sagittarius.yml
2121
- !reference [.bundle, before_script]

.tool-versions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
ruby 3.2.2
1+
ruby 3.4.7
22
postgres 16.1
3+
node 24.10.0

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
ruby '3.2.2'
5+
ruby '3.4.7'
66

77
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
88
gem 'rails', '~> 8.0.0'
@@ -72,7 +72,7 @@ gem 'lograge', '~> 0.14.0'
7272

7373
gem 'declarative_policy', '~> 2.0'
7474

75-
gem 'code0-license', '~> 0.2.0'
75+
gem 'code0-license', '~> 0.3.0'
7676

7777
gem 'good_job', '~> 4.0'
7878

@@ -81,7 +81,7 @@ gem 'rotp'
8181
gem 'grpc', '~> 1.67'
8282
gem 'tucana', '0.0.37'
8383

84-
gem 'code0-identities', '~> 0.0.1'
84+
gem 'code0-identities', '~> 0.0.2'
8585

8686
gem 'pry', '~> 0.15.0'
8787
gem 'pry-byebug', '~> 3.10'

Gemfile.lock

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,20 @@ GEM
8585
msgpack (~> 1.2)
8686
builder (3.3.0)
8787
byebug (12.0.0)
88-
code0-identities (0.0.1)
88+
code0-identities (0.0.2)
89+
base64 (~> 0.3.0)
8990
httparty (~> 0.22)
90-
code0-license (0.2.0)
91+
ruby-saml (~> 1.18)
92+
code0-license (0.3.0)
93+
base64 (~> 0.3.0)
9194
code0-zero_track (0.0.4)
9295
rails (>= 8.0.1)
9396
zeitwerk (~> 2.7)
9497
coderay (1.1.3)
9598
concurrent-ruby (1.3.5)
9699
connection_pool (2.5.4)
97100
crass (1.0.6)
98-
csv (3.3.0)
101+
csv (3.3.5)
99102
database_cleaner-active_record (2.2.2)
100103
activerecord (>= 5.a)
101104
database_cleaner-core (~> 2.0)
@@ -144,7 +147,7 @@ GEM
144147
grpc (1.75.0)
145148
google-protobuf (>= 3.25, < 5.0)
146149
googleapis-common-protos-types (~> 1.0)
147-
httparty (0.22.0)
150+
httparty (0.23.2)
148151
csv
149152
mini_mime (>= 1.0.0)
150153
multi_xml (>= 0.5.2)
@@ -185,7 +188,7 @@ GEM
185188
mini_portile2 (2.8.9)
186189
minitest (5.25.5)
187190
msgpack (1.7.5)
188-
multi_xml (0.7.1)
191+
multi_xml (0.7.2)
189192
bigdecimal (~> 3.1)
190193
net-imap (0.5.12)
191194
date
@@ -347,6 +350,9 @@ GEM
347350
rubocop (~> 1.72, >= 1.72.1)
348351
rubocop-rspec (~> 3.5)
349352
ruby-progressbar (1.13.0)
353+
ruby-saml (1.18.1)
354+
nokogiri (>= 1.13.10)
355+
rexml
350356
ruby-vips (2.2.3)
351357
ffi (~> 1.12)
352358
logger
@@ -392,8 +398,8 @@ PLATFORMS
392398
DEPENDENCIES
393399
bcrypt (~> 3.1.7)
394400
bootsnap
395-
code0-identities (~> 0.0.1)
396-
code0-license (~> 0.2.0)
401+
code0-identities (~> 0.0.2)
402+
code0-license (~> 0.3.0)
397403
code0-zero_track (= 0.0.4)
398404
database_cleaner-active_record (~> 2.1)
399405
debug
@@ -428,7 +434,7 @@ DEPENDENCIES
428434
tzinfo-data
429435

430436
RUBY VERSION
431-
ruby 3.2.2p53
437+
ruby 3.4.7p58
432438

433439
BUNDLED WITH
434440
2.5.9

lib/sagittarius/graphql/error_message_container.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
module Sagittarius
44
module Graphql
55
ErrorMessageContainer = Struct.new(:message)
6-
ServiceResponseErrorContainer = Struct.new(:error_code)
76
end
87
end
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# frozen_string_literal: true
2+
3+
module Sagittarius
4+
module Graphql
5+
ServiceResponseErrorContainer = Struct.new(:error_code)
6+
end
7+
end

spec/support/matchers/exceed_query_limit_matchers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def diff
2121
return combined_counts if @show_common_queries
2222

2323
combined_counts
24-
.transform_values { select_suffixes_with_diffs(_1) }
24+
.transform_values { select_suffixes_with_diffs(it) }
2525
.reject { |_prefix, suffs| suffs.empty? }
2626
end
2727

0 commit comments

Comments
 (0)