Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
Test against Ruby 2.6 and RubyGems 3
Browse files Browse the repository at this point in the history
  • Loading branch information
segiddins committed Dec 28, 2018
1 parent 533ef21 commit 9fa452f
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
23 changes: 17 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ addons:
secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="

rvm:
- 2.5.2
- 2.6.0
- 2.5.3
- 2.4.5
- 2.3.8

Expand All @@ -41,30 +42,40 @@ env:
# We need to know if changes to rubygems will break bundler on release
- RGV=master
# Test the latest rubygems release with all of our supported rubies
- RGV=v2.7.7
- RGV=v3.0.1

jobs:
include:
- rvm: 2.5
- rvm: 2.6.0
script: rake rubocop
stage: linting
# Ruby 2.5, Rubygems 2.7 and up
- rvm: 2.5.3
env: RGV=v2.7.7
stage: test
# Ruby 2.4, Rubygems 2.6 and up
- rvm: 2.4.2
- rvm: 2.4.5
env: RGV=v2.6.14
stage: test
- rvm: 2.4.5
env: RGV=v2.7.7
stage: test
# Ruby 2.3, Rubygems 2.5 and up
- rvm: 2.3.7
env: RGV=v2.5.2
env: RGV=v2.5.3
stage: test
- rvm: 2.3.7
env: RGV=v2.6.14
stage: test
- rvm: 2.3.7
env: RGV=v2.7.7
stage: test
# Ruby-head (we want to know how we're doing, but not fail the build)
- rvm: ruby-head
env: RGV=master
stage: test
# 1.x mode (we want to keep stuff passing in 1.x mode for now)
- rvm: 2.5.1
- rvm: 2.6.0
env: RGV=v2.7.7 BUNDLER_SPEC_SUB_VERSION=1.98
stage: test
- rvm: 1.8.7
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ begin
rubyopt = ENV["RUBYOPT"]
# When editing this list, also edit .travis.yml!
branches = %w[master]
releases = %w[v2.5.2 v2.6.14 v2.7.7]
releases = %w[v2.5.2 v2.6.14 v2.7.7 v3.0.1]
(branches + releases).each do |rg|
desc "Run specs with RubyGems #{rg}"
RSpec::Core::RakeTask.new(rg) do |t|
Expand Down
1 change: 1 addition & 0 deletions lib/bundler/current_ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class CurrentRuby
2.4
2.5
2.6
2.7
].freeze

KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze
Expand Down
8 changes: 4 additions & 4 deletions man/gemfile.5.ronn
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,13 @@ used on platforms with Ruby 2.3, use:
The full list of platforms and supported versions includes:

* `ruby`:
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
* `mri`:
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
* `mingw`:
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
* `x64_mingw`:
2.0, 2.1, 2.2, 2.3, 2.4, 2.5
2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6

As with groups, you can specify one or more platforms:

Expand Down

0 comments on commit 9fa452f

Please sign in to comment.