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

Lock Linguist to Bundler 1.x #4383

Merged
merged 9 commits into from
Jan 16, 2019
+6 −0
Merged

Lock Linguist to Bundler 1.x #4383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b550ff6
Lock bundler to ~> 1.10
lildude Jan 15, 2019
45658ec
Whoops, it's a dev dep
lildude Jan 15, 2019
7b9d807
Install Bundler 1.x as per Travis instructions
lildude Jan 15, 2019
b6989c6
Lets try this
lildude Jan 15, 2019
d0c0da5
What about this method
lildude Jan 15, 2019
e962e77
Whoops, missed off the do
lildude Jan 15, 2019
6e4bdda
Lets try directly in travis.yml as per their docs
lildude Jan 15, 2019
e9fe25b
Ignore rvm entirely
lildude Jan 15, 2019
3f24ffd
Put removal and install into before_install
lildude Jan 15, 2019
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
1 change: 1 addition & 0 deletions github-linguist.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ Gem::Specification.new do |s|
s.add_development_dependency 'color-proximity', '~> 0.2.1'
s.add_development_dependency 'licensed', '~> 1.3.0'
s.add_development_dependency 'licensee'
s.add_development_dependency 'bundler', '~> 1.10'
end
5 changes: 5 additions & 0 deletions script/travis/before_install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

set -ex

# As of 3 Jan 2019, Travis defaults to bundler 2.0 - https://docs.travis-ci.com/user/languages/ruby/#bundler-20
# Linguist still requires Bundler 1.x due to Licensed.
gem uninstall -v '>= 2' -ax bundler || true
gem install bundler -v '< 2'

# Fetch all commits/refs needed to run our tests.
git fetch origin master:master v2.0.0:v2.0.0 test/attributes:test/attributes test/master:test/master

Expand Down