diff options
| author | Miklós Fazekas <mfazekas@szemafor.com> | 2021-03-16 09:30:31 +0100 |
|---|---|---|
| committer | Miklós Fazekas <mfazekas@szemafor.com> | 2021-08-04 08:08:43 +0200 |
| commit | e0d05c6084a90e31f7c5e5cb20ec8abe98bd716d (patch) | |
| tree | 6a5b06a0adf05e14c9f7d0885b860a7f9d416387 | |
| parent | 70b4404f1663907ea4a8c1e136a268f719778b5d (diff) | |
| download | net-ssh-e0d05c6084a90e31f7c5e5cb20ec8abe98bd716d.tar.gz | |
Fixed Gemfile rubocop and improve ansible
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.noed25519 | 6 | ||||
| -rw-r--r-- | test/integration/playbook.yml | 5 |
3 files changed, 5 insertions, 12 deletions
@@ -8,11 +8,5 @@ gem 'byebug', group: %i[development test] if !Gem.win_platform? && RUBY_ENGINE = if ENV["CI"] gem 'codecov', require: false, group: :test gem 'simplecov', require: false, group: :test -<<<<<<< HEAD gem 'webrick' if RUBY_VERSION.split(".")[0].to_i >= 3 -======= - if RUBY_VERSION.split(".")[0].to_i >= 3 - gem 'webrick' - end ->>>>>>> f459f8cf (require webrick on ruby 3 or later) end diff --git a/Gemfile.noed25519 b/Gemfile.noed25519 index be2549c..4adaf04 100644 --- a/Gemfile.noed25519 +++ b/Gemfile.noed25519 @@ -7,11 +7,5 @@ gemspec if ENV["CI"] && !Gem.win_platform? gem 'simplecov', require: false, group: :test gem 'codecov', require: false, group: :test -<<<<<<< HEAD gem 'webrick' if RUBY_VERSION.split(".")[0].to_i >= 3 -======= - if RUBY_VERSION.split(".")[0].to_i >= 3 - gem 'webrick' - end ->>>>>>> f459f8cf (require webrick on ruby 3 or later) end diff --git a/test/integration/playbook.yml b/test/integration/playbook.yml index 23f9f74..75a1ee2 100644 --- a/test/integration/playbook.yml +++ b/test/integration/playbook.yml @@ -34,6 +34,10 @@ rvm1_gpg_key_server: pool.sks-keyservers.net, when: "'{{current_ruby_version.stdout|default()}}' != '{{ruby_version}}' and not no_rvm" } tasks: + - name: Install packages + apt: + pkg: + - libssl-dev - group: name="{{mygroup}}" state=present - user: name=net_ssh_1 password="{{foopwd}}" group="{{mygroup}}" state=present - user: name=net_ssh_2 password="{{foo2pwd}}" group="{{mygroup}}" state=present @@ -111,6 +115,7 @@ - pv - libgmp3-dev - git + - libssl-dev state: present - copy: content='echo "cd /net-ssh ; rake integration-test"' dest=/etc/update-motd.d/99-net-ssh-tests mode=0755 - name: add user to rvm group so they can change gem wrappers |