Skip to content

Fix broken CI #562

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

Merged
merged 2 commits into from
Jul 18, 2018
Merged

Fix broken CI #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
495e361
Extend timeout
mtsmfm Jul 17, 2018
c728135
Use specific rake version to fix `Gem::InstallError`
mtsmfm Jul 17, 2018
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
2 changes: 1 addition & 1 deletion lib/spring/test/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Spring
module Test
class Application
DEFAULT_TIMEOUT = ENV['CI'] ? 30 : 10
DEFAULT_TIMEOUT = ENV['CI'] ? 300 : 10

attr_reader :root, :spring_env

Expand Down
4 changes: 4 additions & 0 deletions lib/spring/test/application_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ def install_spring
append_to_file(application.gemfile, "gem 'nokogiri', '~> 1.6.8'")
end

if RUBY_VERSION < "1.9"
append_to_file(application.gemfile, "gem 'rake', '12.2.1'")
end

application.bundle

FileUtils.rm_rf application.path("bin")
Expand Down