diff options
| author | Kasumi Hanazuki <kasumi@rollingapple.net> | 2017-12-13 16:13:01 +0900 |
|---|---|---|
| committer | Kasumi Hanazuki <kasumi@rollingapple.net> | 2017-12-13 16:13:01 +0900 |
| commit | a704e7f2061da1502ffa4ba44e07cb91a328c620 (patch) | |
| tree | c3fe218a87b41a48211c48a7ce7951c154985523 | |
| parent | 3e0f01f6793d44a1f4c5935914c31cc7754c8b37 (diff) | |
| parent | b9dabea37a49a3c8b5f11085cd16792a787c3d1d (diff) | |
| download | net-ssh-a704e7f2061da1502ffa4ba44e07cb91a328c620.tar.gz | |
Merge remote-tracking branch 'origin/master' into match
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | appveyor.yml | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 4d08aa8..4dd00b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,16 +36,18 @@ matrix: install: - export JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false' - sudo pip install ansible - - gem install bundler -v "= 1.13.7" - - bundle _1.13.7_ install - - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.13.7_ install + - gem install bundler -v "= 1.16" + - gem list bundler + - bundle _1.16_ install + - bundle _1.16_ -v + - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.16_ install - sudo ansible-galaxy install rvm_io.ruby - sudo chown -R travis:travis /home/travis/.ansible - ansible-playbook ./test/integration/playbook.yml -i "localhost," --become -c local -e 'no_rvm=true' -e 'myuser=travis' -e 'mygroup=travis' -e 'homedir=/home/travis' script: - ssh -V - - bundle _1.13.7_ exec rake test - - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.13.7_ exec rake test - - bundle _1.13.7_ exec rake test_test - - bundle _1.13.7_ exec rubocop + - bundle _1.16_ exec rake test + - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.16_ exec rake test + - bundle _1.16_ exec rake test_test + - bundle _1.16_ exec rubocop diff --git a/appveyor.yml b/appveyor.yml index 4c80d4c..0fe7302 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,9 +29,9 @@ install: - if "%ruby_version%" == "jruby-9.1.2.0" ( cinst jruby --version 9.1.2.0 -i --allow-empty-checksums ) - if "%ruby_version%" == "jruby-9.1.2.0" ( SET "PATH=C:\jruby-9.1.2.0\bin\;%PATH%" ) - ruby --version - - gem install bundler --no-document -v 1.13.5 + - gem install bundler --no-document --user-install -v 1.16 - SET BUNDLE_GEMFILE=Gemfile.norbnacl - - bundle _1.13.5_ install --retry=3 + - bundle install --retry=3 - cinst freesshd - cinst putty --allow-empty-checksums - ps: | @@ -51,6 +51,6 @@ install: test_script: - SET BUNDLE_GEMFILE=Gemfile.norbnacl - SET NET_SSH_RUN_WIN_INTEGRATION_TESTS=YES - - bundle _1.13.5_ exec rake test + - bundle exec rake test build: off |