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.

Sign up for GitHub

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

allow bundler 2.5 #16

Merged
merged 1 commit into from
Dec 18, 2023
+18 −7
Merged

allow bundler 2.5 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ jobs:
fail-fast: false
matrix:
ruby-version: [2.7, "3.0", 3.1, 3.2]

bundler-version: [2.4.20, 2.5.1]
exclude:
- ruby-version: 2.7
bundler-version: 2.5.1
env:
BUNDLER_VERSION: ${{ matrix.bundler-version }}
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler: ${{ matrix.bundler-version }}
bundler-cache: true
- name: Run tests
run: bin/rspec
Expand All @@ -33,7 +39,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: "3.0"
bundler-cache: true
- name: Run RuboCop
run: bin/rubocop
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
bundler-multilock (1.2.0)
bundler (~> 2.4.19)
bundler-multilock (1.2.1)
bundler (>= 2.4.19, < 2.6)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -98,4 +98,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.24)

BUNDLED WITH
2.4.20
2.5.1
2 changes: 1 addition & 1 deletion bundler-multilock.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = ">= 2.7"

spec.add_dependency "bundler", "~> 2.4.19"
spec.add_dependency "bundler", ">= 2.4.19", "< 2.6"

spec.add_development_dependency "debug", "~> 1.8"
spec.add_development_dependency "rake", "~> 13.0"
Expand Down
4 changes: 4 additions & 0 deletions lib/bundler/multilock/lockfile_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ def dependencies
def locked_ruby_version
ruby_version
end

def locked_checksums
checksums
end
end

private_constant :LockfileAdapter
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/multilock/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Bundler
module Multilock
VERSION = "1.2.0"
VERSION = "1.2.1"
end
end
1 change: 1 addition & 0 deletions spec/bundler/multilock_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@

lockfile("alt") {}
RUBY
invoke_bundler("config set --local force_ruby_platform true") # workaround for https://github.com/rubygems/rubygems/issues/7304
invoke_bundler("install")

write_gemfile(<<~RUBY)
Expand Down