Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rubygems to 3.6.2 and Bundler to 2.6.2 #11196

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.updater-core
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ WORKDIR $DEPENDABOT_HOME/dependabot-updater
# Note that RubyGems & Bundler versions are currently released in sync, but
# RubyGems version is one major ahead. So when bumping to RubyGems 3.y.z, Bundler
# version will jump to 2.y.z
ARG RUBYGEMS_VERSION=3.5.16
ARG RUBYGEMS_VERSION=3.6.2
RUN gem update --system $RUBYGEMS_VERSION

RUN bundle config set --global build.psych --with-libyaml-source-dir=$DEPENDABOT_HOME/src/libyaml/yaml-$LIBYAML_VERSION && \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ gem "dependabot-terraform", path: "terraform"

# Sorbet
gem "sorbet", "0.5.11630", group: :development
gem "tapioca", "0.16.3", require: false, group: :development
gem "tapioca", github: "https://github.com/Shopify/tapioca/pull/2129", require: false, group: :development

common_gemspec = File.expand_path("common/dependabot-common.gemspec", __dir__)

Expand Down
34 changes: 20 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
GIT
remote: https://github.com/Shopify/tapioca.git
revision: a41dc1c65c7283932d34257228c8a42639f5d61e
ref: refs/pull/2129/head
specs:
tapioca (0.16.5)
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (~> 0.2)
sorbet-static-and-runtime (>= 0.5.11087)
spoom (>= 1.2.0)
thor (>= 1.2.0)
yard-sorbet

PATH
remote: bundler
specs:
Expand Down Expand Up @@ -183,7 +198,7 @@ GEM
docker_registry2 (1.18.2)
rest-client (>= 1.8.0)
domain_name (0.6.20231109)
erubi (1.13.0)
erubi (1.13.1)
excon (0.110.0)
faraday (2.7.11)
base64
Expand Down Expand Up @@ -241,14 +256,14 @@ GEM
parser (3.3.6.0)
ast (~> 2.4.1)
racc
prism (1.2.0)
prism (1.3.0)
psych (5.1.2)
stringio
public_suffix (5.0.4)
racc (1.8.1)
rainbow (3.1.1)
rake (13.1.0)
rbi (0.2.1)
rbi (0.2.2)
prism (~> 1.0)
sorbet-runtime (>= 0.5.9204)
rdoc (6.6.3.1)
Expand Down Expand Up @@ -338,15 +353,6 @@ GEM
stackprof (0.2.25)
stringio (3.1.0)
strscan (3.1.0)
tapioca (0.16.3)
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (~> 0.2)
sorbet-static-and-runtime (>= 0.5.11087)
spoom (>= 1.2.0)
thor (>= 1.2.0)
yard-sorbet
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.2)
Expand Down Expand Up @@ -408,11 +414,11 @@ DEPENDENCIES
rubocop-sorbet (~> 0.8.5)
simplecov (~> 0.22.0)
sorbet (= 0.5.11630)
tapioca (= 0.16.3)
tapioca!
turbo_tests (~> 2.2.0)
vcr (~> 6.1)
webmock (~> 3.18)
webrick (>= 1.7)

BUNDLED WITH
2.5.16
2.6.2
2 changes: 1 addition & 1 deletion bundler/helpers/v2/monkey_patches/git_source_patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def serialize_gemspecs_in(destination)
spec = Bundler.load_gemspec(spec_path)
next unless spec

Bundler.rubygems.set_installed_by_version(spec)
spec.installed_by_version = Gem::VERSION
Bundler.rubygems.validate(spec)
File.binwrite(spec_path, spec.to_ruby)
end
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading