1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2018-08-21 22:01:18 +00:00
parent ec1af131c8
commit 2aefb19888
2 changed files with 1 additions and 29 deletions

View file

@ -1,29 +0,0 @@
sudo: false
language: ruby
script:
- bundle exec rspec
matrix:
include:
- rvm: 2.3.7
- rvm: 2.4.4
before_install:
# https://github.com/travis-ci/travis-ci/issues/8978
- gem update --system
- gem install bundler
- rvm: 2.5.1
before_install:
# https://github.com/travis-ci/travis-ci/issues/8978
- gem update --system
- gem install bundler
- rvm: ruby-head
before_install:
# https://github.com/travis-ci/travis-ci/issues/8978
- gem update --system
- gem install bundler
- rvm: system
install:
- curl -L https://github.com/oracle/truffleruby/releases/download/vm-1.0.0-rc2/truffleruby-1.0.0-rc2-linux-amd64.tar.gz | tar xz
- export PATH="$PWD/truffleruby-1.0.0-rc2-linux-amd64/bin:$PATH"
- $PWD/truffleruby-1.0.0-rc2-linux-amd64/lib/truffle/post_install_hook.sh
- gem install bundler
- bundle install

View file

@ -192,6 +192,7 @@ def fast_forward_master(impl)
Dir.chdir(SOURCE_REPO) do
sh "git", "checkout", "master"
sh "git", "merge", "--ff-only", "#{impl.name}-rebased"
sh "git", "branch", "--delete", "#{impl.name}-rebased"
end
end