Merge branch 'contrib/fix-travis-ci-after-new-github-branch-naming' into develop
This commit is contained in:
commit
459c281b8e
2 changed files with 7 additions and 7 deletions
10
.travis.yml
10
.travis.yml
|
@ -1,10 +1,10 @@
|
||||||
|
---
|
||||||
language: ruby
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
- 2.2
|
|
||||||
- 2.3
|
|
||||||
- 2.4
|
|
||||||
- 2.5
|
- 2.5
|
||||||
|
- 2.6
|
||||||
|
- 2.7
|
||||||
install:
|
install:
|
||||||
- gem install -v 1.12.5 bundler
|
- gem install -v 1.16.2 bundler
|
||||||
- bundle _1.12.5_ install --jobs=3 --retry=3
|
- bundle _1.16.2_ install --jobs=3 --retry=3
|
||||||
script: "bundle exec rake ci"
|
script: "bundle exec rake ci"
|
||||||
|
|
4
Gemfile
4
Gemfile
|
@ -1,7 +1,7 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
|
gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', branch: 'main'
|
||||||
gem 'guard'
|
gem 'guard'
|
||||||
gem 'guard-rspec'
|
gem 'guard-rspec'
|
||||||
gem 'rb-inotify'
|
gem 'rb-inotify'
|
||||||
|
@ -11,7 +11,7 @@ group :development, :test do
|
||||||
gem 'rake', '~> 10.4.2'
|
gem 'rake', '~> 10.4.2'
|
||||||
gem 'rspec', '~> 3.5.0'
|
gem 'rspec', '~> 3.5.0'
|
||||||
gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true')
|
gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true')
|
||||||
gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
|
gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', branch: 'main'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :plugins do
|
group :plugins do
|
||||||
|
|
Loading…
Reference in a new issue