diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/mspec/.travis.yml | 29 | ||||
| -rw-r--r-- | spec/mspec/tool/sync/sync-rubyspec.rb | 1 |
2 files changed, 1 insertions, 29 deletions
diff --git a/spec/mspec/.travis.yml b/spec/mspec/.travis.yml deleted file mode 100644 index 62d67c7970..0000000000 --- a/spec/mspec/.travis.yml +++ /dev/null @@ -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 diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index 4a15b8e4ad..120a4ad64c 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -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 |