Skip to content

Commit eac5a7c

Browse files
committed
Merge remote-tracking branch 'origin/updates-ts10'
2 parents 598d3c9 + c94d36d commit eac5a7c

218 files changed

Lines changed: 4164 additions & 2436 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ jobs:
171171
docker compose run \
172172
--rm \
173173
-e TESTS="${tests}" \
174-
-e MAXMIND_LICENSE_KEY="${MAXMIND_LICENSE_KEY}" \
175174
app \
176175
make test
177176
env:
@@ -181,7 +180,6 @@ jobs:
181180
SPLIT_TEST_VERSION: v0.3.0
182181
CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
183182
CI_NODE_INDEX: ${{ matrix.ci_node_index }}
184-
MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}
185183

186184
- name: Artifact permissions
187185
if: ${{ always() }}

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ COPY build/patches/openresty* /app/build/patches/
3030
COPY tasks/deps/openresty /app/tasks/deps/
3131
RUN make deps:openresty && make clean:dev
3232

33+
COPY build/patches/trafficserver* /app/build/patches/
3334
COPY tasks/deps/trafficserver /app/tasks/deps/
3435
RUN make deps:trafficserver && make clean:dev
3536

Gemfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ source "https://rubygems.org"
33
ruby "~> 3.1"
44

55
# Task runner
6-
gem "thor", "~> 1.3.0"
6+
gem "thor", "~> 1.4.0"
77

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

1111
# CLI helper for running tests
1212
gem "minitest-sprint", "~> 1.3.0"
@@ -18,34 +18,34 @@ gem "minitest-reporters", "~> 1.7.1"
1818
gem "minitest-hooks", "~> 1.5.0"
1919

2020
# Retry certain flaky tests.
21-
gem "minitest-retry", "~> 0.2.2"
21+
gem "minitest-retry", "~> 0.3.0"
2222

2323
# Test metadata for CI environment.
2424
gem "minitest-ci", "~> 3.4.0"
2525

2626
# Ruby lint/style checker
27-
gem "rubocop", "~> 1.4", :require => false
28-
gem "rubocop-minitest", "~> 0.38.0", :require => false
27+
gem "rubocop", "~> 1.81", :require => false
28+
gem "rubocop-minitest", "~> 0.38.2", :require => false
2929

3030
# Running background processes
3131
gem "childprocess"
3232

3333
# Making HTTP requests
34-
gem "typhoeus", "~> 1.4.0"
34+
gem "typhoeus", "~> 1.5.0"
3535

3636
# JSON parsing
37-
gem "multi_json", "~> 1.15.0"
38-
gem "oj", "~> 3.10"
37+
gem "multi_json", "~> 1.19.1"
38+
gem "oj", "~> 3.16"
3939

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

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

5050
# Programmatically generate Rails session cookies.
5151
gem "rails_compatible_cookies_utils", "~> 0.1.0"
@@ -55,7 +55,7 @@ gem "addressable", "~> 2.8.0"
5555

5656
# Browser/JavaScript integration tests
5757
gem "capybara", "~> 3.32"
58-
gem "selenium-webdriver", "~> 4.15"
58+
gem "selenium-webdriver", "~> 4.32"
5959

6060
# Take screenshots on capybara test failures
6161
gem "capybara-screenshot", "~> 1.0.22"
@@ -67,7 +67,7 @@ gem "capybara-shadowdom", "~> 0.3.0"
6767
gem "nokogiri", "~> 1.18"
6868

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

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

0 commit comments

Comments
 (0)