diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9468fe7..4dfd0ba5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,12 +10,12 @@ include: file: ci-template.gitlab-ci.yml .bundle: - image: ruby:3.2.2 + image: ruby:3.4.7 before_script: - bundle install --jobs $(nproc) .rails: - image: ghcr.io/code0-tech/build-images/ruby-postgres:211.1-ruby-3.2.2-postgres-16.1 + image: ghcr.io/code0-tech/build-images/ruby-postgres:220.1-ruby-3.4.7-postgres-16.1 before_script: - cp tooling/pipeline/sagittarius.yml config/sagittarius.yml - !reference [.bundle, before_script] diff --git a/.tool-versions b/.tool-versions index a1c4ef8b..64f196c3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,3 @@ -ruby 3.2.2 +ruby 3.4.7 postgres 16.1 +node 24.10.0 diff --git a/Gemfile b/Gemfile index 80ce6a8c..072bf2cf 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -ruby '3.2.2' +ruby '3.4.7' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem 'rails', '~> 8.0.0' @@ -72,7 +72,7 @@ gem 'lograge', '~> 0.14.0' gem 'declarative_policy', '~> 2.0' -gem 'code0-license', '~> 0.2.0' +gem 'code0-license', '~> 0.3.0' gem 'good_job', '~> 4.0' @@ -81,7 +81,7 @@ gem 'rotp' gem 'grpc', '~> 1.67' gem 'tucana', '0.0.37' -gem 'code0-identities', '~> 0.0.1' +gem 'code0-identities', '~> 0.0.2' gem 'pry', '~> 0.15.0' gem 'pry-byebug', '~> 3.10' diff --git a/Gemfile.lock b/Gemfile.lock index ab981f9a..02709946 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,9 +85,12 @@ GEM msgpack (~> 1.2) builder (3.3.0) byebug (12.0.0) - code0-identities (0.0.1) + code0-identities (0.0.2) + base64 (~> 0.3.0) httparty (~> 0.22) - code0-license (0.2.0) + ruby-saml (~> 1.18) + code0-license (0.3.0) + base64 (~> 0.3.0) code0-zero_track (0.0.4) rails (>= 8.0.1) zeitwerk (~> 2.7) @@ -95,7 +98,7 @@ GEM concurrent-ruby (1.3.5) connection_pool (2.5.4) crass (1.0.6) - csv (3.3.0) + csv (3.3.5) database_cleaner-active_record (2.2.2) activerecord (>= 5.a) database_cleaner-core (~> 2.0) @@ -144,7 +147,7 @@ GEM grpc (1.75.0) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) - httparty (0.22.0) + httparty (0.23.2) csv mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) @@ -185,7 +188,7 @@ GEM mini_portile2 (2.8.9) minitest (5.25.5) msgpack (1.7.5) - multi_xml (0.7.1) + multi_xml (0.7.2) bigdecimal (~> 3.1) net-imap (0.5.12) date @@ -347,6 +350,9 @@ GEM rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) ruby-progressbar (1.13.0) + ruby-saml (1.18.1) + nokogiri (>= 1.13.10) + rexml ruby-vips (2.2.3) ffi (~> 1.12) logger @@ -392,8 +398,8 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) bootsnap - code0-identities (~> 0.0.1) - code0-license (~> 0.2.0) + code0-identities (~> 0.0.2) + code0-license (~> 0.3.0) code0-zero_track (= 0.0.4) database_cleaner-active_record (~> 2.1) debug @@ -428,7 +434,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 3.2.2p53 + ruby 3.4.7p58 BUNDLED WITH 2.5.9 diff --git a/lib/sagittarius/graphql/error_message_container.rb b/lib/sagittarius/graphql/error_message_container.rb index 5840d7da..34a8d03f 100644 --- a/lib/sagittarius/graphql/error_message_container.rb +++ b/lib/sagittarius/graphql/error_message_container.rb @@ -3,6 +3,5 @@ module Sagittarius module Graphql ErrorMessageContainer = Struct.new(:message) - ServiceResponseErrorContainer = Struct.new(:error_code) end end diff --git a/lib/sagittarius/graphql/service_response_error_container.rb b/lib/sagittarius/graphql/service_response_error_container.rb new file mode 100644 index 00000000..fd4ef263 --- /dev/null +++ b/lib/sagittarius/graphql/service_response_error_container.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module Sagittarius + module Graphql + ServiceResponseErrorContainer = Struct.new(:error_code) + end +end diff --git a/spec/support/matchers/exceed_query_limit_matchers.rb b/spec/support/matchers/exceed_query_limit_matchers.rb index 7bf7e84d..d6f9f1fb 100644 --- a/spec/support/matchers/exceed_query_limit_matchers.rb +++ b/spec/support/matchers/exceed_query_limit_matchers.rb @@ -21,7 +21,7 @@ def diff return combined_counts if @show_common_queries combined_counts - .transform_values { select_suffixes_with_diffs(_1) } + .transform_values { select_suffixes_with_diffs(it) } .reject { |_prefix, suffs| suffs.empty? } end