Skip to content

Commit 03475c1

Browse files
dependabot[bot]dduugggithub-actions[bot]
authored
Bump the bundler group across 1 directory with 9 updates (#72)
* Bump the bundler group across 1 directory with 9 updates Bumps the bundler group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [packwerk](https://github.com/Shopify/packwerk) | `3.2.3` | `3.3.0` | | [minitest](https://github.com/minitest/minitest) | `6.0.2` | `6.0.6` | | [mocha](https://github.com/freerange/mocha) | `3.0.2` | `3.1.0` | | [rake](https://github.com/ruby/rake) | `13.3.1` | `13.4.2` | | [rubocop](https://github.com/rubocop/rubocop) | `1.85.1` | `1.86.2` | | [rubocop-gusto](https://github.com/gusto/rubocop-gusto) | `10.6.0` | `10.9.3` | | [sorbet](https://github.com/sorbet/sorbet) | `0.6.13258` | `0.6.13261` | Updates `packwerk` from 3.2.3 to 3.3.0 - [Release notes](https://github.com/Shopify/packwerk/releases) - [Commits](Shopify/packwerk@v3.2.3...v3.3.0) Updates `railties` from 8.1.2 to 8.1.3 - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v8.1.3/railties/CHANGELOG.md) - [Commits](rails/rails@v8.1.2...v8.1.3) Updates `zeitwerk` from 2.7.5 to 2.8.2 - [Changelog](https://github.com/fxn/zeitwerk/blob/main/CHANGELOG.md) - [Commits](fxn/zeitwerk@v2.7.5...v2.8.2) Updates `minitest` from 6.0.2 to 6.0.6 - [Changelog](https://github.com/minitest/minitest/blob/master/History.rdoc) - [Commits](minitest/minitest@v6.0.2...v6.0.6) Updates `mocha` from 3.0.2 to 3.1.0 - [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md) - [Commits](freerange/mocha@v3.0.2...v3.1.0) Updates `rake` from 13.3.1 to 13.4.2 - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v13.3.1...v13.4.2) Updates `rubocop` from 1.85.1 to 1.86.2 - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](rubocop/rubocop@v1.85.1...v1.86.2) Updates `rubocop-gusto` from 10.6.0 to 10.9.3 - [Release notes](https://github.com/gusto/rubocop-gusto/releases) - [Changelog](https://github.com/Gusto/rubocop-gusto/blob/main/CHANGELOG.md) - [Commits](Gusto/rubocop-gusto@v10.6.0...v10.9.3) Updates `sorbet` from 0.6.13258 to 0.6.13261 - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) --- updated-dependencies: - dependency-name: packwerk dependency-version: 3.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: bundler - dependency-name: railties dependency-version: 8.1.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: bundler - dependency-name: zeitwerk dependency-version: 2.8.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: bundler - dependency-name: minitest dependency-version: 6.0.6 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bundler - dependency-name: mocha dependency-version: 3.1.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler - dependency-name: rake dependency-version: 13.4.2 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler - dependency-name: rubocop dependency-version: 1.86.2 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler - dependency-name: rubocop-gusto dependency-version: 10.9.3 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler - dependency-name: sorbet dependency-version: 0.6.13261 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bundler ... Signed-off-by: dependabot[bot] <support@github.com> * Add workflow to regenerate gem RBIs on Dependabot PRs Dependency bumps can change gem APIs, so this workflow runs 'bundle exec tapioca gems' on any dependabot/* PR and pushes the regenerated sorbet/rbi/gems files back onto the PR branch. * Regenerate gem RBIs [dependabot skip] * Use released rubocop-sorbet instead of a git SHA pin The pin was added so the (then-unreleased) Sorbet/RedundantTLet and Sorbet/RedundantTLetForLiteral cops could clean up redundant T.let calls. That cleanup is done and the RBS migration removed the remaining T.let usage, so those cops are no longer needed. Drop the github pin and let rubocop-sorbet resolve to the released version via rubocop-gusto. * Regenerate gem RBIs [dependabot skip] * Exclude Sorbet-payload gems from tapioca gem RBIs Several gems (json, date, logger, ...) already have RBIs in Sorbet's payload (sorbet/rbi/stdlib and sorbet/rbi/gems in the sorbet/sorbet repo). Generating them with tapioca only duplicates and conflicts with Sorbet's built-ins, so add them to tapioca's gem.exclude and drop the now-redundant RBI files. rake is intentionally not excluded — thor's RBI references ::Rake::DSL / ::Rake::FileUtilsExt, which the payload rake RBI does not define. Also normalize the config for yamllint (document start, sequence indentation) and drop the empty dsl scaffold. * Type-check regenerated RBIs in the Dependabot RBI workflow The RBI commit is pushed with GITHUB_TOKEN, which doesn't re-trigger CI, so the regenerated RBIs were never type-checked. Run 'srb tc' in the same job after pushing. Only Sorbet is affected by RBI changes (rubocop and the tests don't read sorbet/rbi), and the shared-config CI already runs rubocop/srb tc/tests on the PR's other commits, so we don't duplicate those here. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Douglas Eichelberger <doug.eichelberger@gusto.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 9ff8074 commit 03475c1

42 files changed

Lines changed: 3342 additions & 21389 deletions

Some content is hidden

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

‎.github/workflows/dependabot-tapioca.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Update Dependabot RBIs
2+
3+
# Dependency bumps can change gem APIs, so regenerate the Sorbet gem RBIs
4+
# (`bundle exec tapioca gems`) and push the result back onto the Dependabot PR.
5+
on:
6+
pull_request:
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
tapioca-gems:
13+
name: Regenerate gem RBIs
14+
if: startsWith(github.head_ref, 'dependabot/')
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
18+
with:
19+
ref: ${{ github.head_ref }}
20+
- uses: ruby/setup-ruby@4c56a21280b36d862b5fc31348f463d60bdc55d5 # v1
21+
with:
22+
ruby-version: '3.4'
23+
bundler-cache: true
24+
- name: Regenerate gem RBIs
25+
run: bundle exec tapioca gems
26+
- name: Commit, push, and type-check updated RBIs
27+
run: |
28+
if [[ -z "$(git status --porcelain sorbet/rbi)" ]]; then
29+
echo "No RBI changes to commit."
30+
exit 0
31+
fi
32+
git config user.name 'github-actions[bot]'
33+
git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
34+
git add sorbet/rbi
35+
git commit -m "Regenerate gem RBIs [dependabot skip]"
36+
git push
37+
# The push above uses GITHUB_TOKEN, which doesn't re-trigger CI.
38+
# RBI changes only affect Sorbet, so type-check them here instead.
39+
bundle exec srb tc

‎Gemfile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,3 @@
33
source 'https://rubygems.org'
44

55
gemspec
6-
7-
# Pinned to main for the not-yet-released `Sorbet/RedundantTLet` and
8-
# `Sorbet/RedundantTLetForLiteral` cops (see Shopify/rubocop-sorbet#372 and #367).
9-
gem 'rubocop-sorbet', github: 'Shopify/rubocop-sorbet', ref: '7b7d3cb5a41cee8207b3cd00c21f5ef43f7140fd'

‎Gemfile.lock‎

Lines changed: 40 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/Shopify/rubocop-sorbet.git
3-
revision: 7b7d3cb5a41cee8207b3cd00c21f5ef43f7140fd
4-
ref: 7b7d3cb5a41cee8207b3cd00c21f5ef43f7140fd
5-
specs:
6-
rubocop-sorbet (0.12.0)
7-
lint_roller
8-
rubocop (>= 1.75.2)
9-
101
PATH
112
remote: .
123
specs:
@@ -18,23 +9,23 @@ PATH
189
GEM
1910
remote: https://rubygems.org/
2011
specs:
21-
actionpack (8.1.2)
22-
actionview (= 8.1.2)
23-
activesupport (= 8.1.2)
12+
actionpack (8.1.3)
13+
actionview (= 8.1.3)
14+
activesupport (= 8.1.3)
2415
nokogiri (>= 1.8.5)
2516
rack (>= 2.2.4)
2617
rack-session (>= 1.0.1)
2718
rack-test (>= 0.6.3)
2819
rails-dom-testing (~> 2.2)
2920
rails-html-sanitizer (~> 1.6)
3021
useragent (~> 0.16)
31-
actionview (8.1.2)
32-
activesupport (= 8.1.2)
22+
actionview (8.1.3)
23+
activesupport (= 8.1.3)
3324
builder (~> 3.1)
3425
erubi (~> 1.11)
3526
rails-dom-testing (~> 2.2)
3627
rails-html-sanitizer (~> 1.6)
37-
activesupport (8.1.2)
28+
activesupport (8.1.3)
3829
base64
3930
bigdecimal
4031
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -47,8 +38,6 @@ GEM
4738
securerandom (>= 0.3)
4839
tzinfo (~> 2.0, >= 2.0.5)
4940
uri (>= 0.13.1)
50-
addressable (2.8.9)
51-
public_suffix (>= 2.0.2, < 8.0)
5241
ast (2.4.3)
5342
base64 (0.3.0)
5443
benchmark (0.5.0)
@@ -59,7 +48,7 @@ GEM
5948
erubi (~> 1.4)
6049
parser (>= 2.4)
6150
smart_properties
62-
bigdecimal (4.0.1)
51+
bigdecimal (4.1.2)
6352
builder (3.3.0)
6453
coderay (1.1.3)
6554
concurrent-ruby (1.3.6)
@@ -78,44 +67,39 @@ GEM
7867
prism (>= 1.3.0)
7968
rdoc (>= 4.0.0)
8069
reline (>= 0.4.2)
81-
json (2.18.1)
82-
json-schema (6.1.0)
83-
addressable (~> 2.8)
84-
bigdecimal (>= 3.1, < 5)
70+
json (2.19.7)
8571
language_server-protocol (3.17.0.5)
8672
lint_roller (1.1.0)
8773
logger (1.7.0)
88-
loofah (2.25.0)
74+
loofah (2.25.1)
8975
crass (~> 1.0.2)
9076
nokogiri (>= 1.12.0)
91-
mcp (0.8.0)
92-
json-schema (>= 4.1)
9377
method_source (1.1.0)
94-
minitest (6.0.2)
78+
minitest (6.0.6)
9579
drb (~> 2.0)
9680
prism (~> 1.5)
97-
mocha (3.0.2)
81+
mocha (3.1.0)
9882
ruby2_keywords (>= 0.0.5)
9983
netrc (0.11.0)
100-
nokogiri (1.19.1-arm64-darwin)
84+
nokogiri (1.19.3-arm64-darwin)
10185
racc (~> 1.4)
102-
nokogiri (1.19.1-x86_64-darwin)
86+
nokogiri (1.19.3-x86_64-darwin)
10387
racc (~> 1.4)
104-
nokogiri (1.19.1-x86_64-linux-gnu)
88+
nokogiri (1.19.3-x86_64-linux-gnu)
10589
racc (~> 1.4)
106-
packwerk (3.2.3)
90+
packwerk (3.3.0)
10791
activesupport (>= 6.0)
10892
ast
93+
benchmark
10994
better_html
11095
bundler
11196
constant_resolver (>= 0.3)
112-
parallel
97+
parallel (< 2)
11398
parser
114-
prism (>= 0.25.0)
115-
sorbet-runtime (>= 0.5.9914)
99+
prism (>= 1.4.0)
116100
zeitwerk (>= 2.6.1)
117101
parallel (1.28.0)
118-
parser (3.3.10.2)
102+
parser (3.3.11.1)
119103
ast (~> 2.4.1)
120104
racc
121105
pp (0.6.3)
@@ -129,7 +113,6 @@ GEM
129113
psych (5.3.1)
130114
date
131115
stringio
132-
public_suffix (7.0.5)
133116
racc (1.8.1)
134117
rack (3.2.5)
135118
rack-session (2.1.1)
@@ -146,17 +129,17 @@ GEM
146129
rails-html-sanitizer (1.7.0)
147130
loofah (~> 2.25)
148131
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)
149-
railties (8.1.2)
150-
actionpack (= 8.1.2)
151-
activesupport (= 8.1.2)
132+
railties (8.1.3)
133+
actionpack (= 8.1.3)
134+
activesupport (= 8.1.3)
152135
irb (~> 1.13)
153136
rackup (>= 1.0.0)
154137
rake (>= 12.2)
155138
thor (~> 1.0, >= 1.2.2)
156139
tsort (>= 0.2)
157140
zeitwerk (~> 2.6)
158141
rainbow (3.1.1)
159-
rake (13.3.1)
142+
rake (13.4.2)
160143
rbi (0.3.12)
161144
prism (~> 1.0)
162145
rbs (>= 4.0.1)
@@ -168,27 +151,26 @@ GEM
168151
erb
169152
psych (>= 4.0.0)
170153
tsort
171-
regexp_parser (2.11.3)
154+
regexp_parser (2.12.0)
172155
reline (0.6.3)
173156
io-console (~> 0.5)
174157
require-hooks (0.4.0)
175158
rexml (3.4.4)
176-
rubocop (1.85.1)
159+
rubocop (1.86.2)
177160
json (~> 2.3)
178161
language_server-protocol (~> 3.17.0.2)
179162
lint_roller (~> 1.1.0)
180-
mcp (~> 0.6)
181-
parallel (~> 1.10)
163+
parallel (>= 1.10)
182164
parser (>= 3.3.0.2)
183165
rainbow (>= 2.2.2, < 4.0)
184166
regexp_parser (>= 2.9.3, < 3.0)
185167
rubocop-ast (>= 1.49.0, < 2.0)
186168
ruby-progressbar (~> 1.7)
187169
unicode-display_width (>= 2.4.0, < 4.0)
188-
rubocop-ast (1.49.0)
170+
rubocop-ast (1.49.1)
189171
parser (>= 3.3.7.2)
190172
prism (~> 1.7)
191-
rubocop-gusto (10.6.0)
173+
rubocop-gusto (10.9.3)
192174
lint_roller
193175
rubocop (>= 1.76)
194176
rubocop-performance
@@ -206,21 +188,24 @@ GEM
206188
rubocop-rspec (3.9.0)
207189
lint_roller (~> 1.1)
208190
rubocop (~> 1.81)
191+
rubocop-sorbet (0.12.0)
192+
lint_roller
193+
rubocop (>= 1.75.2)
209194
ruby-progressbar (1.13.0)
210195
ruby2_keywords (0.0.5)
211196
rubydex (0.2.5-arm64-darwin)
212197
rubydex (0.2.5-x86_64-darwin)
213198
rubydex (0.2.5-x86_64-linux)
214199
securerandom (0.4.1)
215200
smart_properties (1.17.0)
216-
sorbet (0.6.13258)
217-
sorbet-static (= 0.6.13258)
218-
sorbet-runtime (0.6.13258)
219-
sorbet-static (0.6.13258-universal-darwin)
220-
sorbet-static (0.6.13258-x86_64-linux)
221-
sorbet-static-and-runtime (0.6.13258)
222-
sorbet (= 0.6.13258)
223-
sorbet-runtime (= 0.6.13258)
201+
sorbet (0.6.13261)
202+
sorbet-static (= 0.6.13261)
203+
sorbet-runtime (0.6.13261)
204+
sorbet-static (0.6.13261-universal-darwin)
205+
sorbet-static (0.6.13261-x86_64-linux)
206+
sorbet-static-and-runtime (0.6.13261)
207+
sorbet (= 0.6.13261)
208+
sorbet-runtime (= 0.6.13261)
224209
spoom (1.7.16)
225210
erubi (>= 1.10.0)
226211
prism (>= 0.28.0)
@@ -251,7 +236,7 @@ GEM
251236
unicode-emoji (4.2.0)
252237
uri (1.1.1)
253238
useragent (0.16.11)
254-
zeitwerk (2.7.5)
239+
zeitwerk (2.8.2)
255240

256241
PLATFORMS
257242
arm64-darwin
@@ -266,7 +251,6 @@ DEPENDENCIES
266251
rake
267252
rubocop
268253
rubocop-gusto
269-
rubocop-sorbet!
270254
sorbet
271255
tapioca
272256

0 commit comments

Comments
 (0)