From a334590adc85d6ee1d2a04b805d93dff75b2b3e3 Mon Sep 17 00:00:00 2001 From: Protocol Buffers Team Bot Date: Fri, 23 Oct 2026 19:37:00 +0000 Subject: [PATCH 1/2] Bump rails and activestorage from 6.1.7.8 to 7.2.4 in /examples/simple_rails_api Bumps rails (including activestorage, actionpack, activesupport, actionview, activerecord, activejob, actionmailer, actioncable, actionmailbox, actiontext, and railties) from 6.1.7.8 to 7.2.4 in examples/simple_rails_api. --- examples/simple_rails_api/Gemfile | 2 +- examples/simple_rails_api/Gemfile.lock | 262 +++++++++++++++---------- 2 files changed, 156 insertions(+), 108 deletions(-) diff --git a/examples/simple_rails_api/Gemfile b/examples/simple_rails_api/Gemfile index 385b769..be21571 100644 --- a/examples/simple_rails_api/Gemfile +++ b/examples/simple_rails_api/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.1.7' +gem 'rails', '~> 7.2.3' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 4e78dc3..238f8f4 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -1,166 +1,214 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + actioncable (7.2.4) + actionpack (= 7.2.4) + activesupport (= 7.2.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) - mail (>= 2.7.1) - actionmailer (6.1.7.8) - actionpack (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activesupport (= 6.1.7.8) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.7.8) - actionview (= 6.1.7.8) - activesupport (= 6.1.7.8) - rack (~> 2.0, >= 2.0.9) + zeitwerk (~> 2.6) + actionmailbox (7.2.4) + actionpack (= 7.2.4) + activejob (= 7.2.4) + activerecord (= 7.2.4) + activestorage (= 7.2.4) + activesupport (= 7.2.4) + mail (>= 2.8.0) + actionmailer (7.2.4) + actionpack (= 7.2.4) + actionview (= 7.2.4) + activejob (= 7.2.4) + activesupport (= 7.2.4) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.4) + actionview (= 7.2.4) + activesupport (= 7.2.4) + cgi + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.3) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.8) - actionpack (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.4) + actionpack (= 7.2.4) + activerecord (= 7.2.4) + activestorage (= 7.2.4) + activesupport (= 7.2.4) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.8) - activesupport (= 6.1.7.8) + actionview (7.2.4) + activesupport (= 7.2.4) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.8) - activesupport (= 6.1.7.8) + cgi + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.4) + activesupport (= 7.2.4) globalid (>= 0.3.6) - activemodel (6.1.7.8) - activesupport (= 6.1.7.8) - activerecord (6.1.7.8) - activemodel (= 6.1.7.8) - activesupport (= 6.1.7.8) - activestorage (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activesupport (= 6.1.7.8) + activemodel (7.2.4) + activesupport (= 7.2.4) + activerecord (7.2.4) + activemodel (= 7.2.4) + activesupport (= 7.2.4) + timeout (>= 0.4.0) + activestorage (7.2.4) + actionpack (= 7.2.4) + activejob (= 7.2.4) + activerecord (= 7.2.4) + activesupport (= 7.2.4) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (6.1.7.8) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.4) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5, < 3) + drb i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) + logger (>= 1.4.2) + minitest (>= 5.1, < 6) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.1.3) bootsnap (1.9.1) msgpack (~> 1.0) builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.3.4) - crass (1.0.6) - date (3.3.4) - erubi (1.13.0) + cgi (0.5.2) + concurrent-ruby (1.3.8) + connection_pool (2.5.5) + crass (1.0.8) + date (3.6.0) + drb (2.2.3) + erb (6.0.7) + erubi (1.13.1) ffi (1.15.4) - globalid (1.2.1) + globalid (1.4.0) activesupport (>= 6.1) - i18n (1.14.6) + i18n (1.15.2) concurrent-ruby (~> 1.0) + io-console (0.9.4) + irb (1.18.0) + pp (>= 0.6.0) + prism (>= 1.3.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.22.0) + logger (1.7.0) + loofah (2.25.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) + mail (2.9.1) + logger mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.4) - method_source (1.1.0) + marcel (1.2.1) mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.25.1) + mini_portile2 (2.8.9) + minitest (5.27.0) msgpack (1.4.2) - net-imap (0.4.16) + net-imap (0.6.8) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.2) + net-protocol (0.4.0) timeout - net-smtp (0.5.0) + net-smtp (0.5.2) net-protocol - nio4r (2.7.3) - nokogiri (1.16.7) + nio4r (2.7.5) + nokogiri (1.19.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) + pp (0.6.4) + prettyprint + prettyprint (0.2.1) + prism (2.0.0) puma (5.6.9) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.9) - rack-test (2.1.0) + rack (3.2.7) + rack-session (2.1.2) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.3.0) rack (>= 1.3) - rails (6.1.7.8) - actioncable (= 6.1.7.8) - actionmailbox (= 6.1.7.8) - actionmailer (= 6.1.7.8) - actionpack (= 6.1.7.8) - actiontext (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activemodel (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + rackup (2.3.1) + rack (>= 3) + rails (7.2.4) + actioncable (= 7.2.4) + actionmailbox (= 7.2.4) + actionmailer (= 7.2.4) + actionpack (= 7.2.4) + actiontext (= 7.2.4) + actionview (= 7.2.4) + activejob (= 7.2.4) + activemodel (= 7.2.4) + activerecord (= 7.2.4) + activestorage (= 7.2.4) + activesupport (= 7.2.4) bundler (>= 1.15.0) - railties (= 6.1.7.8) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.2.0) + railties (= 7.2.4) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) - method_source + rails-html-sanitizer (1.7.1) + loofah (~> 2.25, >= 2.25.2) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.2.4) + actionpack (= 7.2.4) + activesupport (= 7.2.4) + cgi + irb (~> 1.13) + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - rake (13.2.1) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) + rake (13.4.2) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) + rbs (4.2.0) + logger + prism (>= 1.6.0) + tsort + rdoc (8.1.0) + erb + prism (>= 1.6.0) + rbs (>= 4.0.0) + tsort + reline (0.7.0) + io-console (~> 0.5) + securerandom (0.4.1) spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (4.2.1) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) sqlite3 (1.4.2) - thor (1.3.2) - timeout (0.4.1) + thor (1.5.0) + timeout (0.6.1) + tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - websocket-driver (0.7.6) + useragent (0.16.11) + websocket-driver (0.8.2) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.7.0) + zeitwerk (2.8.3) PLATFORMS ruby @@ -170,11 +218,11 @@ DEPENDENCIES byebug listen (>= 3.0.5, < 3.2) puma (~> 5.6) - rails (~> 6.1.7) + rails (~> 7.2.3) spring spring-watcher-listen (~> 2.0.0) sqlite3 (~> 1.4) tzinfo-data BUNDLED WITH - 2.2.24 + 2.5.22 From 9e0b225676d2285a23c508e837518662e5e79e04 Mon Sep 17 00:00:00 2001 From: Protocol Buffers Team Bot Date: Fri, 23 Oct 2026 20:47:31 +0000 Subject: [PATCH 2/2] Use @rules_pkg//:pkg.bzl for pkg_tar in ruby/tests/BUILD.bazel In Bazel 4.1.0, the built-in @bazel_tools//tools/build_defs/pkg:build_tar depends on @bazel_tools//third_party/py/six (six 1.10.0), whose _SixMetaPathImporter only implements PEP 302 find_module() and fails under Python 3.12 on ubuntu-24.04 (ubuntu-latest) with: ModuleNotFoundError: No module named 'six.moves' Load pkg_tar from @rules_pkg//:pkg.bzl (already fetched by rules_ruby_dependencies()), whose build_tar uses Python's standard library argparse without six or absl. --- ruby/tests/BUILD.bazel | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruby/tests/BUILD.bazel b/ruby/tests/BUILD.bazel index 1ac2d43..803bd7a 100644 --- a/ruby/tests/BUILD.bazel +++ b/ruby/tests/BUILD.bazel @@ -1,14 +1,14 @@ +load( + "@io_bazel_rules_docker//container:container.bzl", + "container_image", +) load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") +load("@rules_pkg//:pkg.bzl", "pkg_tar") load( "//ruby:defs.bzl", "ruby_binary", "ruby_test", ) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") -load( - "@io_bazel_rules_docker//container:container.bzl", - "container_image", -) # Checks if args are correctly passed to the ruby script. ruby_test(