Skip to content

Commit be59273

Browse files
committed
Merge remote-tracking branch 'origin/updates'
2 parents e80ac9c + 10a92ca commit be59273

39 files changed

+4529
-3712
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ jobs:
199199

200200
- name: Archive artifacts
201201
if: ${{ always() }}
202-
uses: actions/upload-artifact@v3
202+
uses: actions/upload-artifact@v4
203203
with:
204204
name: test-artifacts-matrix-${{ matrix.ci_node_index }}
205205
path: test/tmp/artifacts/
@@ -213,7 +213,7 @@ jobs:
213213
if: always()
214214
steps:
215215
- name: Download Artifacts
216-
uses: actions/download-artifact@v3
216+
uses: actions/download-artifact@v4
217217
with:
218218
path: ./artifacts
219219

Dockerfile-opensearch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM public.ecr.aws/opensearchproject/opensearch:2.11.1
1+
FROM public.ecr.aws/opensearchproject/opensearch:2.17.1
22
RUN /usr/share/opensearch/bin/opensearch-plugin install --batch mapper-murmur3

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ruby "~> 3.1"
66
gem "thor", "~> 1.3.0"
77

88
# Tests
9-
gem "minitest", "~> 5.24.1"
9+
gem "minitest", "~> 5.25.1"
1010

1111
# CLI helper for running tests
12-
gem "minitest-sprint", "~> 1.2.0"
12+
gem "minitest-sprint", "~> 1.3.0"
1313

1414
# More test outputs
1515
gem "minitest-reporters", "~> 1.7.1"
@@ -25,7 +25,7 @@ gem "minitest-ci", "~> 3.4.0"
2525

2626
# Ruby lint/style checker
2727
gem "rubocop", "~> 1.4", :require => false
28-
gem "rubocop-minitest", "~> 0.35.0", :require => false
28+
gem "rubocop-minitest", "~> 0.36.0", :require => false
2929

3030
# Running background processes
3131
gem "childprocess"
@@ -38,14 +38,14 @@ gem "multi_json", "~> 1.15.0"
3838
gem "oj", "~> 3.10"
3939

4040
# Database libraries
41-
gem "activerecord", "~> 7.1.1", :require => "active_record"
41+
gem "activerecord", "~> 7.2.2", :require => "active_record"
4242
gem "pg", "~> 1.5.3"
4343
gem "opensearch-ruby", "~> 3.4.0"
4444
gem "faraday-typhoeus", "~> 1.1.0"
45-
gem "active_attr", "~> 0.16.0"
45+
gem "active_attr", "~> 0.17.0"
4646

4747
# Factories for test database data
48-
gem "factory_bot", "~> 6.4.0"
48+
gem "factory_bot", "~> 6.5.0"
4949

5050
# Programmatically generate Rails session cookies.
5151
gem "rails_compatible_cookies_utils", "~> 0.1.0"
@@ -67,7 +67,7 @@ gem "capybara-shadowdom", "~> 0.3.0"
6767
gem "nokogiri", "~> 1.14"
6868

6969
# Useful additions
70-
gem "activesupport", "~> 7.1.1"
70+
gem "activesupport", "~> 7.2.2"
7171

7272
# Generating fake strings and data.
7373
gem "faker", "~> 3.0"

Gemfile.lock

Lines changed: 92 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,54 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionpack (7.1.3.4)
5-
actionview (= 7.1.3.4)
6-
activesupport (= 7.1.3.4)
4+
actionpack (7.2.2.1)
5+
actionview (= 7.2.2.1)
6+
activesupport (= 7.2.2.1)
77
nokogiri (>= 1.8.5)
88
racc
9-
rack (>= 2.2.4)
9+
rack (>= 2.2.4, < 3.2)
1010
rack-session (>= 1.0.1)
1111
rack-test (>= 0.6.3)
1212
rails-dom-testing (~> 2.2)
1313
rails-html-sanitizer (~> 1.6)
14-
actionview (7.1.3.4)
15-
activesupport (= 7.1.3.4)
14+
useragent (~> 0.16)
15+
actionview (7.2.2.1)
16+
activesupport (= 7.2.2.1)
1617
builder (~> 3.1)
1718
erubi (~> 1.11)
1819
rails-dom-testing (~> 2.2)
1920
rails-html-sanitizer (~> 1.6)
20-
active_attr (0.16.0)
21-
actionpack (>= 3.0.2, < 7.2)
22-
activemodel (>= 3.0.2, < 7.2)
23-
activesupport (>= 3.0.2, < 7.2)
24-
activemodel (7.1.3.4)
25-
activesupport (= 7.1.3.4)
26-
activerecord (7.1.3.4)
27-
activemodel (= 7.1.3.4)
28-
activesupport (= 7.1.3.4)
21+
active_attr (0.17.1)
22+
actionpack (>= 3.0.2, < 8.1)
23+
activemodel (>= 3.0.2, < 8.1)
24+
activesupport (>= 3.0.2, < 8.1)
25+
activemodel (7.2.2.1)
26+
activesupport (= 7.2.2.1)
27+
activerecord (7.2.2.1)
28+
activemodel (= 7.2.2.1)
29+
activesupport (= 7.2.2.1)
2930
timeout (>= 0.4.0)
30-
activesupport (7.1.3.4)
31+
activesupport (7.2.2.1)
3132
base64
33+
benchmark (>= 0.3)
3234
bigdecimal
33-
concurrent-ruby (~> 1.0, >= 1.0.2)
35+
concurrent-ruby (~> 1.0, >= 1.3.1)
3436
connection_pool (>= 2.2.5)
3537
drb
3638
i18n (>= 1.6, < 2)
39+
logger (>= 1.4.2)
3740
minitest (>= 5.1)
38-
mutex_m
39-
tzinfo (~> 2.0)
41+
securerandom (>= 0.3)
42+
tzinfo (~> 2.0, >= 2.0.5)
4043
addressable (2.8.7)
4144
public_suffix (>= 2.0.2, < 7.0)
4245
ansi (1.5.0)
4346
ast (2.4.2)
4447
awesome_print (1.9.2)
4548
base64 (0.2.0)
4649
bcrypt (3.1.20)
47-
bigdecimal (3.1.8)
50+
benchmark (0.4.0)
51+
bigdecimal (3.1.9)
4852
builder (3.3.0)
4953
capybara (3.40.0)
5054
addressable
@@ -60,135 +64,137 @@ GEM
6064
launchy
6165
capybara-shadowdom (0.3.0)
6266
capybara
63-
childprocess (5.0.0)
64-
concurrent-ruby (1.3.3)
65-
connection_pool (2.4.1)
67+
childprocess (5.1.0)
68+
logger (~> 1.5)
69+
concurrent-ruby (1.3.5)
70+
connection_pool (2.5.0)
6671
crass (1.0.6)
6772
drb (2.2.1)
6873
encryptor (3.0.0)
69-
erubi (1.13.0)
74+
erubi (1.13.1)
7075
ethon (0.16.0)
7176
ffi (>= 1.15.0)
72-
factory_bot (6.4.6)
73-
activesupport (>= 5.0.0)
74-
faker (3.4.2)
77+
factory_bot (6.5.1)
78+
activesupport (>= 6.1.0)
79+
faker (3.5.1)
7580
i18n (>= 1.8.11, < 2)
76-
faraday (2.10.0)
77-
faraday-net_http (>= 2.0, < 3.2)
81+
faraday (2.12.2)
82+
faraday-net_http (>= 2.0, < 3.5)
83+
json
7884
logger
79-
faraday-net_http (3.1.0)
80-
net-http
85+
faraday-net_http (3.4.0)
86+
net-http (>= 0.5.0)
8187
faraday-typhoeus (1.1.0)
8288
faraday (~> 2.0)
8389
typhoeus (~> 1.4)
84-
ffi (1.17.0)
85-
i18n (1.14.5)
90+
ffi (1.17.1)
91+
i18n (1.14.7)
8692
concurrent-ruby (~> 1.0)
8793
ice_nine (0.11.2)
88-
json (2.7.2)
89-
language_server-protocol (3.17.0.3)
90-
launchy (3.0.1)
94+
json (2.9.1)
95+
language_server-protocol (3.17.0.4)
96+
launchy (3.1.0)
9197
addressable (~> 2.8)
9298
childprocess (~> 5.0)
93-
logger (1.6.0)
94-
loofah (2.22.0)
99+
logger (~> 1.6)
100+
logger (1.6.5)
101+
loofah (2.24.0)
95102
crass (~> 1.0.2)
96103
nokogiri (>= 1.12.0)
97104
matrix (0.4.2)
98105
mini_mime (1.1.5)
99-
mini_portile2 (2.8.7)
100-
minitest (5.24.1)
106+
mini_portile2 (2.8.8)
107+
minitest (5.25.4)
101108
minitest-ci (3.4.0)
102109
minitest (>= 5.0.6)
103-
minitest-hooks (1.5.1)
110+
minitest-hooks (1.5.2)
104111
minitest (> 5.3)
105112
minitest-reporters (1.7.1)
106113
ansi
107114
builder
108115
minitest (>= 5.0)
109116
ruby-progressbar
110-
minitest-retry (0.2.2)
117+
minitest-retry (0.2.5)
111118
minitest (>= 5.0)
112-
minitest-sprint (1.2.2)
119+
minitest-sprint (1.3.0)
113120
path_expander (~> 1.1)
114121
multi_json (1.15.0)
115-
mutex_m (0.2.0)
116-
net-http (0.4.1)
122+
net-http (0.6.0)
117123
uri
118124
net-protocol (0.2.2)
119125
timeout
120126
net-smtp (0.5.0)
121127
net-protocol
122-
nokogiri (1.16.6)
128+
nokogiri (1.18.2)
123129
mini_portile2 (~> 2.8.2)
124130
racc (~> 1.4)
125-
nokogiri (1.16.6-aarch64-linux)
126-
racc (~> 1.4)
127-
nokogiri (1.16.6-x86_64-linux)
128-
racc (~> 1.4)
129-
oj (3.16.4)
131+
oj (3.16.9)
130132
bigdecimal (>= 3.0)
133+
ostruct (>= 0.2)
131134
opensearch-ruby (3.4.0)
132135
faraday (>= 1.0, < 3)
133136
multi_json (>= 1.0)
134-
parallel (1.25.1)
135-
parser (3.3.4.0)
137+
ostruct (0.6.1)
138+
parallel (1.26.3)
139+
parser (3.3.7.0)
136140
ast (~> 2.4.1)
137141
racc
138-
path_expander (1.1.2)
139-
pg (1.5.6)
140-
public_suffix (6.0.0)
141-
racc (1.8.0)
142-
rack (3.1.7)
143-
rack-session (2.0.0)
142+
path_expander (1.1.3)
143+
pg (1.5.9)
144+
public_suffix (6.0.1)
145+
racc (1.8.1)
146+
rack (3.1.9)
147+
rack-session (2.1.0)
148+
base64 (>= 0.1.0)
144149
rack (>= 3.0.0)
145-
rack-test (2.1.0)
150+
rack-test (2.2.0)
146151
rack (>= 1.3)
147152
rails-dom-testing (2.2.0)
148153
activesupport (>= 5.0.0)
149154
minitest
150155
nokogiri (>= 1.6)
151-
rails-html-sanitizer (1.6.0)
156+
rails-html-sanitizer (1.6.2)
152157
loofah (~> 2.21)
153-
nokogiri (~> 1.14)
158+
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)
154159
rails_compatible_cookies_utils (0.1.2)
155160
rainbow (3.1.1)
156-
regexp_parser (2.9.2)
157-
rexml (3.3.2)
158-
strscan
159-
rubocop (1.65.0)
161+
regexp_parser (2.10.0)
162+
rexml (3.4.0)
163+
rubocop (1.71.1)
160164
json (~> 2.3)
161165
language_server-protocol (>= 3.17.0)
162166
parallel (~> 1.10)
163167
parser (>= 3.3.0.2)
164168
rainbow (>= 2.2.2, < 4.0)
165-
regexp_parser (>= 2.4, < 3.0)
166-
rexml (>= 3.2.5, < 4.0)
167-
rubocop-ast (>= 1.31.1, < 2.0)
169+
regexp_parser (>= 2.9.3, < 3.0)
170+
rubocop-ast (>= 1.38.0, < 2.0)
168171
ruby-progressbar (~> 1.7)
169-
unicode-display_width (>= 2.4.0, < 3.0)
170-
rubocop-ast (1.31.3)
172+
unicode-display_width (>= 2.4.0, < 4.0)
173+
rubocop-ast (1.38.0)
171174
parser (>= 3.3.1.0)
172-
rubocop-minitest (0.35.1)
175+
rubocop-minitest (0.36.0)
173176
rubocop (>= 1.61, < 2.0)
174177
rubocop-ast (>= 1.31.1, < 2.0)
175178
ruby-progressbar (1.13.0)
176-
rubyzip (2.3.2)
177-
selenium-webdriver (4.22.0)
179+
rubyzip (2.4.1)
180+
securerandom (0.4.1)
181+
selenium-webdriver (4.28.0)
178182
base64 (~> 0.2)
179183
logger (~> 1.4)
180184
rexml (~> 3.2, >= 3.2.5)
181185
rubyzip (>= 1.2.2, < 3.0)
182186
websocket (~> 1.0)
183-
strscan (3.1.0)
184-
thor (1.3.1)
185-
timeout (0.4.1)
187+
thor (1.3.2)
188+
timeout (0.4.3)
186189
typhoeus (1.4.1)
187190
ethon (>= 0.9.0)
188191
tzinfo (2.0.6)
189192
concurrent-ruby (~> 1.0)
190-
unicode-display_width (2.5.0)
191-
uri (0.13.0)
193+
unicode-display_width (3.1.4)
194+
unicode-emoji (~> 4.0, >= 4.0.4)
195+
unicode-emoji (4.0.4)
196+
uri (1.0.2)
197+
useragent (0.16.11)
192198
websocket (1.2.11)
193199
xpath (3.2.0)
194200
nokogiri (~> 1.8)
@@ -200,9 +206,9 @@ PLATFORMS
200206
x86_64-linux
201207

202208
DEPENDENCIES
203-
active_attr (~> 0.16.0)
204-
activerecord (~> 7.1.1)
205-
activesupport (~> 7.1.1)
209+
active_attr (~> 0.17.0)
210+
activerecord (~> 7.2.2)
211+
activesupport (~> 7.2.2)
206212
addressable (~> 2.8.0)
207213
awesome_print (~> 1.9.2)
208214
bcrypt (~> 3.1.12)
@@ -212,16 +218,16 @@ DEPENDENCIES
212218
childprocess
213219
concurrent-ruby (~> 1.3.3)
214220
encryptor (~> 3.0.0)
215-
factory_bot (~> 6.4.0)
221+
factory_bot (~> 6.5.0)
216222
faker (~> 3.0)
217223
faraday-typhoeus (~> 1.1.0)
218224
ice_nine (~> 0.11.2)
219-
minitest (~> 5.24.1)
225+
minitest (~> 5.25.1)
220226
minitest-ci (~> 3.4.0)
221227
minitest-hooks (~> 1.5.0)
222228
minitest-reporters (~> 1.7.1)
223229
minitest-retry (~> 0.2.2)
224-
minitest-sprint (~> 1.2.0)
230+
minitest-sprint (~> 1.3.0)
225231
multi_json (~> 1.15.0)
226232
net-smtp (~> 0.5.0)
227233
nokogiri (~> 1.14)
@@ -231,7 +237,7 @@ DEPENDENCIES
231237
rails_compatible_cookies_utils (~> 0.1.0)
232238
rainbow (~> 3.1.1)
233239
rubocop (~> 1.4)
234-
rubocop-minitest (~> 0.35.0)
240+
rubocop-minitest (~> 0.36.0)
235241
selenium-webdriver (~> 4.15)
236242
thor (~> 1.3.0)
237243
typhoeus (~> 1.4.0)

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export PREFIX=$(prefix)
1515
default: all
1616

1717
# Download and locally install the "task" tool.
18-
task_version:=3.38.0
18+
task_version:=3.41.0
1919
$(source_dir)/tasks/bootstrap-$(task_version): ;
2020
$(work_dir)/stamp/bootstrap-$(task_version): $(source_dir)/tasks/bootstrap-$(task_version)
2121
$(source_dir)/tasks/bootstrap-$(task_version)

0 commit comments

Comments
 (0)