Skip to content

Update build scripts #203

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 3 commits into from
Apr 5, 2018
Merged

Update build scripts #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37ea613
Fix ruby prompt script for case sensitivity and unknown options
JonRowe Apr 3, 2018
71faebd
Update travis versions
JonRowe Apr 3, 2018
ab9c2cc
Pull across changes from rspec/rspec-rails#1982
JonRowe Apr 5, 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
5 changes: 3 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,11 +427,12 @@ def confirm_branch_name(name)
return name unless system("git show-branch #{name} > /dev/null 2>&1")

puts "Branch #{name} already exists, delete? [Y/n] or rename new branch? [r[ename] <name>]"
case STDIN.gets.downcase
when /^y/
case input = STDIN.gets.downcase
when /^y/i
`git branch -D #{name}`
when /^r(?:ename)? (.*)$/
name = $1
when /^n/i
else
abort "Unknown option: #{input}"
end
Expand Down
12 changes: 5 additions & 7 deletions travis/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ cache:
- ../bundle
before_install:
- gem update --system # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
- gem install bundler
- unset _JAVA_OPTIONS
- "script/clone_all_rspec_repos"
# Note this doesn't work on JRUBY 2.0.0 mode so we don't do it, the excluded versions are broken on Ruby 2.3
- if [ "jruby" != "$TRAVIS_RUBY_VERSION" ]; then gem install bundler --version "1.11.2"; fi
- alias bundle="bundle _1.11.2_"
bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
script: "script/run_build"
rvm:
Expand All @@ -19,10 +17,10 @@ rvm:
- 1.9.3
- 2.0.0
- 2.1
- 2.2.9
- 2.3.6
- 2.4.3
- 2.5.0
- 2.2.10
- 2.3.7
- 2.4.4
- 2.5.1
- ruby-head
- ree
- rbx-3
Expand Down