diff options
| -rw-r--r-- | .github/bors.toml | 9 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 18 | ||||
| -rw-r--r-- | spec/other/bundle_ruby_spec.rb | 2 | ||||
| -rw-r--r-- | spec/other/platform_spec.rb | 2 |
5 files changed, 30 insertions, 4 deletions
diff --git a/.github/bors.toml b/.github/bors.toml new file mode 100644 index 0000000000..db93b69597 --- /dev/null +++ b/.github/bors.toml @@ -0,0 +1,9 @@ +status = [ + "continuous-integration/travis-ci/push" +] + +timeout-sec = 14400 + +[committer] +name = "Bundlerbot" +email = "bot@bundler.io" diff --git a/.travis.yml b/.travis.yml index 95b959aea1..9cd9f873cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ before_script: branches: only: - master - - auto + - staging + - trying - /.+-dev$/ - /.+-stable$/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 618cb643ed..fe051607ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,20 @@ -## 1.16.4 (2017-08-17) +## 1.16.5 (2018-09-18) + +Changes: + + - Add support for TruffleRuby (@eregon) + +Bugfixes: + + - Avoid printing git errors when checking the version on incorrectly packaged versions of Bundler ([#6453](https://github.com/bundler/bundler/issues/6453), @greysteil) + - Fix issue where Bundler does not check the given class when comparing equality in DepProxy (@ChrisBr) + - Handle `RangeNotSatisfiable` error in Compact Index (@MaxLap) + - Check for initialized `search` variable in `LazySpecification` (@voxik) + - Fix LoadError occurring in nested bundle exec calls ([#6537](https://github.com/bundler/bundler/issues/6537), @colby-swandale) + - Check that Bundler::Deprecate is not an autoload constant ([#6163](https://github.com/bundler/bundler/issues/6163), @eregon) + - Prefer non-pre-release versions when performing a `bundle update --patch` ([#6684](https://github.com/bundler/bundler/issues/6684), @segiddins) + +## 1.16.4 (2018-08-17) Changes: diff --git a/spec/other/bundle_ruby_spec.rb b/spec/other/bundle_ruby_spec.rb index bcb38a63ca..a7da9cbec9 100644 --- a/spec/other/bundle_ruby_spec.rb +++ b/spec/other/bundle_ruby_spec.rb @@ -54,7 +54,7 @@ RSpec.describe "bundle_ruby", :bundler => "< 2" do expect(out).to include("ruby 1.8.7 (rbx 1.2.4)") end - it "handles truffleruby" do + it "handles truffleruby", :rubygems => ">= 2.1.0" do gemfile <<-G source "file://#{gem_repo1}" ruby "2.5.1", :engine => 'truffleruby', :engine_version => '1.0.0-rc6' diff --git a/spec/other/platform_spec.rb b/spec/other/platform_spec.rb index 3654b630df..ca74945563 100644 --- a/spec/other/platform_spec.rb +++ b/spec/other/platform_spec.rb @@ -149,7 +149,7 @@ G expect(out).to eq("ruby 1.8.7 (rbx 1.2.4)") end - it "handles truffleruby" do + it "handles truffleruby", :rubygems => ">= 2.1.0" do gemfile <<-G source "file://#{gem_repo1}" ruby "2.5.1", :engine => 'truffleruby', :engine_version => '1.0.0-rc6' |