Skip to content

Commit c7609cc

Browse files
JasonLunnJasonLunn
authored
Bump rails and activestorage from 6.1.7.8 to 7.2.4 in /examples/simple_rails_api (#71)
* 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. * 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. * Pin Bazel version in nested example workspaces and update simple_script bundle * Pin GitHub Actions runner to ubuntu-24.04 and restore Bundler 2.1.4 default
1 parent 588d9dd commit c7609cc

8 files changed

Lines changed: 167 additions & 114 deletions

File tree

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
test-suite:
1313
name: "Test Suite"
1414

15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616

1717
strategy:
1818
fail-fast: false # Don't cancel all jobs if one fails.

‎bin/test-suite‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export BAZEL_TEST_OPTS="--verbose_failures --test_verbose_timeout_warnings --ver
2424
export RUBY_VERSION="$(__version.detect .ruby-version)"
2525
export BUNDLER_VERSION=$(gem.gemfile.bundler-version)
2626
export RULES_VERSION=$(__version.detect .rules_version)
27+
export USE_BAZEL_VERSION="${USE_BAZEL_VERSION:-$(__version.detect .bazelversion)}"
2728

2829
h3bg "RUBY_VERSION=${RUBY_VERSION}"
2930

‎examples/example_gem/.bazelversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.1.0

‎examples/simple_rails_api/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '~> 6.1.7'
5+
gem 'rails', '~> 7.2.3'
66
# Use sqlite3 as the database for Active Record
77
gem 'sqlite3', '~> 1.4'
88
# Use Puma as the app server

‎examples/simple_rails_api/Gemfile.lock‎

Lines changed: 155 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,214 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.7.8)
5-
actionpack (= 6.1.7.8)
6-
activesupport (= 6.1.7.8)
4+
actioncable (7.2.4)
5+
actionpack (= 7.2.4)
6+
activesupport (= 7.2.4)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.7.8)
10-
actionpack (= 6.1.7.8)
11-
activejob (= 6.1.7.8)
12-
activerecord (= 6.1.7.8)
13-
activestorage (= 6.1.7.8)
14-
activesupport (= 6.1.7.8)
15-
mail (>= 2.7.1)
16-
actionmailer (6.1.7.8)
17-
actionpack (= 6.1.7.8)
18-
actionview (= 6.1.7.8)
19-
activejob (= 6.1.7.8)
20-
activesupport (= 6.1.7.8)
21-
mail (~> 2.5, >= 2.5.4)
22-
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.7.8)
24-
actionview (= 6.1.7.8)
25-
activesupport (= 6.1.7.8)
26-
rack (~> 2.0, >= 2.0.9)
9+
zeitwerk (~> 2.6)
10+
actionmailbox (7.2.4)
11+
actionpack (= 7.2.4)
12+
activejob (= 7.2.4)
13+
activerecord (= 7.2.4)
14+
activestorage (= 7.2.4)
15+
activesupport (= 7.2.4)
16+
mail (>= 2.8.0)
17+
actionmailer (7.2.4)
18+
actionpack (= 7.2.4)
19+
actionview (= 7.2.4)
20+
activejob (= 7.2.4)
21+
activesupport (= 7.2.4)
22+
mail (>= 2.8.0)
23+
rails-dom-testing (~> 2.2)
24+
actionpack (7.2.4)
25+
actionview (= 7.2.4)
26+
activesupport (= 7.2.4)
27+
cgi
28+
nokogiri (>= 1.8.5)
29+
racc
30+
rack (>= 2.2.4, < 3.3)
31+
rack-session (>= 1.0.1)
2732
rack-test (>= 0.6.3)
28-
rails-dom-testing (~> 2.0)
29-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.7.8)
31-
actionpack (= 6.1.7.8)
32-
activerecord (= 6.1.7.8)
33-
activestorage (= 6.1.7.8)
34-
activesupport (= 6.1.7.8)
33+
rails-dom-testing (~> 2.2)
34+
rails-html-sanitizer (~> 1.6)
35+
useragent (~> 0.16)
36+
actiontext (7.2.4)
37+
actionpack (= 7.2.4)
38+
activerecord (= 7.2.4)
39+
activestorage (= 7.2.4)
40+
activesupport (= 7.2.4)
41+
globalid (>= 0.6.0)
3542
nokogiri (>= 1.8.5)
36-
actionview (6.1.7.8)
37-
activesupport (= 6.1.7.8)
43+
actionview (7.2.4)
44+
activesupport (= 7.2.4)
3845
builder (~> 3.1)
39-
erubi (~> 1.4)
40-
rails-dom-testing (~> 2.0)
41-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.7.8)
43-
activesupport (= 6.1.7.8)
46+
cgi
47+
erubi (~> 1.11)
48+
rails-dom-testing (~> 2.2)
49+
rails-html-sanitizer (~> 1.6)
50+
activejob (7.2.4)
51+
activesupport (= 7.2.4)
4452
globalid (>= 0.3.6)
45-
activemodel (6.1.7.8)
46-
activesupport (= 6.1.7.8)
47-
activerecord (6.1.7.8)
48-
activemodel (= 6.1.7.8)
49-
activesupport (= 6.1.7.8)
50-
activestorage (6.1.7.8)
51-
actionpack (= 6.1.7.8)
52-
activejob (= 6.1.7.8)
53-
activerecord (= 6.1.7.8)
54-
activesupport (= 6.1.7.8)
53+
activemodel (7.2.4)
54+
activesupport (= 7.2.4)
55+
activerecord (7.2.4)
56+
activemodel (= 7.2.4)
57+
activesupport (= 7.2.4)
58+
timeout (>= 0.4.0)
59+
activestorage (7.2.4)
60+
actionpack (= 7.2.4)
61+
activejob (= 7.2.4)
62+
activerecord (= 7.2.4)
63+
activesupport (= 7.2.4)
5564
marcel (~> 1.0)
56-
mini_mime (>= 1.1.0)
57-
activesupport (6.1.7.8)
58-
concurrent-ruby (~> 1.0, >= 1.0.2)
65+
activesupport (7.2.4)
66+
base64
67+
benchmark (>= 0.3)
68+
bigdecimal
69+
concurrent-ruby (~> 1.0, >= 1.3.1)
70+
connection_pool (>= 2.2.5, < 3)
71+
drb
5972
i18n (>= 1.6, < 2)
60-
minitest (>= 5.1)
61-
tzinfo (~> 2.0)
62-
zeitwerk (~> 2.3)
73+
logger (>= 1.4.2)
74+
minitest (>= 5.1, < 6)
75+
securerandom (>= 0.3)
76+
tzinfo (~> 2.0, >= 2.0.5)
77+
base64 (0.3.0)
78+
benchmark (0.5.0)
79+
bigdecimal (4.1.3)
6380
bootsnap (1.9.1)
6481
msgpack (~> 1.0)
6582
builder (3.3.0)
6683
byebug (11.1.3)
67-
concurrent-ruby (1.3.4)
68-
crass (1.0.6)
69-
date (3.3.4)
70-
erubi (1.13.0)
84+
cgi (0.5.2)
85+
concurrent-ruby (1.3.8)
86+
connection_pool (2.5.5)
87+
crass (1.0.8)
88+
date (3.6.0)
89+
drb (2.2.3)
90+
erb (6.0.7)
91+
erubi (1.13.1)
7192
ffi (1.15.4)
72-
globalid (1.2.1)
93+
globalid (1.4.0)
7394
activesupport (>= 6.1)
74-
i18n (1.14.6)
95+
i18n (1.15.2)
7596
concurrent-ruby (~> 1.0)
97+
io-console (0.9.4)
98+
irb (1.18.0)
99+
pp (>= 0.6.0)
100+
prism (>= 1.3.0)
101+
rdoc (>= 4.0.0)
102+
reline (>= 0.4.2)
76103
listen (3.0.8)
77104
rb-fsevent (~> 0.9, >= 0.9.4)
78105
rb-inotify (~> 0.9, >= 0.9.7)
79-
loofah (2.22.0)
106+
logger (1.7.0)
107+
loofah (2.25.2)
80108
crass (~> 1.0.2)
81109
nokogiri (>= 1.12.0)
82-
mail (2.8.1)
110+
mail (2.9.1)
111+
logger
83112
mini_mime (>= 0.1.1)
84113
net-imap
85114
net-pop
86115
net-smtp
87-
marcel (1.0.4)
88-
method_source (1.1.0)
116+
marcel (1.2.1)
89117
mini_mime (1.1.5)
90-
mini_portile2 (2.8.7)
91-
minitest (5.25.1)
118+
mini_portile2 (2.8.9)
119+
minitest (5.27.0)
92120
msgpack (1.4.2)
93-
net-imap (0.4.16)
121+
net-imap (0.6.8)
94122
date
95123
net-protocol
96124
net-pop (0.1.2)
97125
net-protocol
98-
net-protocol (0.2.2)
126+
net-protocol (0.4.0)
99127
timeout
100-
net-smtp (0.5.0)
128+
net-smtp (0.5.2)
101129
net-protocol
102-
nio4r (2.7.3)
103-
nokogiri (1.16.7)
130+
nio4r (2.7.5)
131+
nokogiri (1.19.4)
104132
mini_portile2 (~> 2.8.2)
105133
racc (~> 1.4)
134+
pp (0.6.4)
135+
prettyprint
136+
prettyprint (0.2.1)
137+
prism (2.0.0)
106138
puma (5.6.9)
107139
nio4r (~> 2.0)
108140
racc (1.8.1)
109-
rack (2.2.9)
110-
rack-test (2.1.0)
141+
rack (3.2.7)
142+
rack-session (2.1.2)
143+
base64 (>= 0.1.0)
144+
rack (>= 3.0.0)
145+
rack-test (2.3.0)
111146
rack (>= 1.3)
112-
rails (6.1.7.8)
113-
actioncable (= 6.1.7.8)
114-
actionmailbox (= 6.1.7.8)
115-
actionmailer (= 6.1.7.8)
116-
actionpack (= 6.1.7.8)
117-
actiontext (= 6.1.7.8)
118-
actionview (= 6.1.7.8)
119-
activejob (= 6.1.7.8)
120-
activemodel (= 6.1.7.8)
121-
activerecord (= 6.1.7.8)
122-
activestorage (= 6.1.7.8)
123-
activesupport (= 6.1.7.8)
147+
rackup (2.3.1)
148+
rack (>= 3)
149+
rails (7.2.4)
150+
actioncable (= 7.2.4)
151+
actionmailbox (= 7.2.4)
152+
actionmailer (= 7.2.4)
153+
actionpack (= 7.2.4)
154+
actiontext (= 7.2.4)
155+
actionview (= 7.2.4)
156+
activejob (= 7.2.4)
157+
activemodel (= 7.2.4)
158+
activerecord (= 7.2.4)
159+
activestorage (= 7.2.4)
160+
activesupport (= 7.2.4)
124161
bundler (>= 1.15.0)
125-
railties (= 6.1.7.8)
126-
sprockets-rails (>= 2.0.0)
127-
rails-dom-testing (2.2.0)
162+
railties (= 7.2.4)
163+
rails-dom-testing (2.3.0)
128164
activesupport (>= 5.0.0)
129165
minitest
130166
nokogiri (>= 1.6)
131-
rails-html-sanitizer (1.6.0)
132-
loofah (~> 2.21)
133-
nokogiri (~> 1.14)
134-
railties (6.1.7.8)
135-
actionpack (= 6.1.7.8)
136-
activesupport (= 6.1.7.8)
137-
method_source
167+
rails-html-sanitizer (1.7.1)
168+
loofah (~> 2.25, >= 2.25.2)
169+
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)
170+
railties (7.2.4)
171+
actionpack (= 7.2.4)
172+
activesupport (= 7.2.4)
173+
cgi
174+
irb (~> 1.13)
175+
rackup (>= 1.0.0)
138176
rake (>= 12.2)
139-
thor (~> 1.0)
140-
rake (13.2.1)
177+
thor (~> 1.0, >= 1.2.2)
178+
tsort (>= 0.2)
179+
zeitwerk (~> 2.6)
180+
rake (13.4.2)
141181
rb-fsevent (0.11.0)
142182
rb-inotify (0.10.1)
143183
ffi (~> 1.0)
184+
rbs (4.2.0)
185+
logger
186+
prism (>= 1.6.0)
187+
tsort
188+
rdoc (8.1.0)
189+
erb
190+
prism (>= 1.6.0)
191+
rbs (>= 4.0.0)
192+
tsort
193+
reline (0.7.0)
194+
io-console (~> 0.5)
195+
securerandom (0.4.1)
144196
spring (2.1.1)
145197
spring-watcher-listen (2.0.1)
146198
listen (>= 2.7, < 4.0)
147199
spring (>= 1.2, < 3.0)
148-
sprockets (4.2.1)
149-
concurrent-ruby (~> 1.0)
150-
rack (>= 2.2.4, < 4)
151-
sprockets-rails (3.5.2)
152-
actionpack (>= 6.1)
153-
activesupport (>= 6.1)
154-
sprockets (>= 3.0.0)
155200
sqlite3 (1.4.2)
156-
thor (1.3.2)
157-
timeout (0.4.1)
201+
thor (1.5.0)
202+
timeout (0.6.1)
203+
tsort (0.2.0)
158204
tzinfo (2.0.6)
159205
concurrent-ruby (~> 1.0)
160-
websocket-driver (0.7.6)
206+
useragent (0.16.11)
207+
websocket-driver (0.8.2)
208+
base64
161209
websocket-extensions (>= 0.1.0)
162210
websocket-extensions (0.1.5)
163-
zeitwerk (2.7.0)
211+
zeitwerk (2.8.3)
164212

165213
PLATFORMS
166214
ruby
@@ -170,11 +218,11 @@ DEPENDENCIES
170218
byebug
171219
listen (>= 3.0.5, < 3.2)
172220
puma (~> 5.6)
173-
rails (~> 6.1.7)
221+
rails (~> 7.2.3)
174222
spring
175223
spring-watcher-listen (~> 2.0.0)
176224
sqlite3 (~> 1.4)
177225
tzinfo-data
178226

179227
BUNDLED WITH
180-
2.2.24
228+
2.5.22

‎examples/simple_script/.bazelversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.1.0

‎examples/simple_script/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ruby_test(
4040
deps = [
4141
"@bundle//:awesome_print",
4242
"@bundle//:bin",
43+
"@bundle//:colored2",
4344
"@bundle//:rspec",
4445
"@bundle//:rspec-its",
4546
],
@@ -65,6 +66,7 @@ ruby_rspec(
6566
]),
6667
deps = [
6768
"@bundle//:awesome_print",
69+
"@bundle//:colored2",
6870
],
6971
)
7072

‎ruby/tests/BUILD.bazel‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
load(
2+
"@io_bazel_rules_docker//container:container.bzl",
3+
"container_image",
4+
)
15
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
6+
load("@rules_pkg//:pkg.bzl", "pkg_tar")
27
load(
38
"//ruby:defs.bzl",
49
"ruby_binary",
510
"ruby_test",
611
)
7-
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
8-
load(
9-
"@io_bazel_rules_docker//container:container.bzl",
10-
"container_image",
11-
)
1212

1313
# Checks if args are correctly passed to the ruby script.
1414
ruby_test(

0 commit comments

Comments
 (0)