Skip to content
代码片段 群组 项目
未验证 提交 772565df 编辑于 作者: Rémy Coutable's avatar Rémy Coutable 提交者: GitLab
浏览文件

Merge branch 'sh-fix-bundler-checksum-rubygems-3.5.6' into 'master'

Make bundler-checksum work with RubyGems 3.5.6

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144985



Merged-by: default avatarRémy Coutable <remy@rymai.me>
Approved-by: default avatarRémy Coutable <remy@rymai.me>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
无相关合并请求
......@@ -12,7 +12,10 @@ def execute
checksums = []
require "bundler/vendored_uri"
args = [nil, Bundler::Source::Rubygems::Remote.new(Bundler::URI("https://rubygems.org")), nil]
# RubyGems v3.5.6 got rid of Bundler::URI in favor of a vendored Gem::URI: https://github.com/rubygems/rubygems/pull/7386
rubygems_source = 'https://rubygems.org'
remote = defined?(Gem::URI) ? Gem::URI(rubygems_source) : Bundler::URI(rubygems_source)
args = [nil, Bundler::Source::Rubygems::Remote.new(remote), nil]
# gem_remote_fetcher added in https://github.com/rubygems/rubygems/pull/7092/
args << nil if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new("2.5.0")
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册