diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 5927355..8fb2429 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -41,6 +41,12 @@ jobs: - ruby: 2.6.6 vagrant: v2.2.14 allow_fail: false + - ruby: 2.7.2 + vagrant: v2.2.10 + allow_fail: false + # above block is to ensure compatible with Ubuntu 20.04 vagrant package + # although it uses 2.2.10 it is the earliest version that will install on + # ruby 2.7 without patching - ruby: 3.0.0 vagrant: allow_fail: false diff --git a/lib/vagrant-libvirt/action/destroy_domain.rb b/lib/vagrant-libvirt/action/destroy_domain.rb index 95b32f9..3b64b2c 100644 --- a/lib/vagrant-libvirt/action/destroy_domain.rb +++ b/lib/vagrant-libvirt/action/destroy_domain.rb @@ -2,11 +2,8 @@ require 'log4r' -begin - require 'rexml' -rescue LoadError - require 'rexml/rexml' -end +require 'rexml/document' +require 'rexml/xpath' require 'vagrant-libvirt/util/domain_flags' diff --git a/lib/vagrant-libvirt/action/resolve_disk_settings.rb b/lib/vagrant-libvirt/action/resolve_disk_settings.rb index 1213f19..2726995 100644 --- a/lib/vagrant-libvirt/action/resolve_disk_settings.rb +++ b/lib/vagrant-libvirt/action/resolve_disk_settings.rb @@ -2,11 +2,8 @@ require 'log4r' -begin - require 'rexml' -rescue LoadError - require 'rexml/rexml' -end +require 'rexml/document' +require 'rexml/xpath' require 'vagrant-libvirt/util/resolvers' diff --git a/lib/vagrant-libvirt/action/start_domain.rb b/lib/vagrant-libvirt/action/start_domain.rb index 577e724..524c229 100644 --- a/lib/vagrant-libvirt/action/start_domain.rb +++ b/lib/vagrant-libvirt/action/start_domain.rb @@ -3,6 +3,8 @@ require 'log4r' require 'rexml/document' +require 'rexml/formatters/pretty' +require 'rexml/xpath' require 'vagrant-libvirt/util/xml' diff --git a/lib/vagrant-libvirt/util/compat.rb b/lib/vagrant-libvirt/util/compat.rb index 3c15d55..ce1aff6 100644 --- a/lib/vagrant-libvirt/util/compat.rb +++ b/lib/vagrant-libvirt/util/compat.rb @@ -11,7 +11,7 @@ module VagrantPlugins module Compat def self.action_hook_args(name, action) # handle different number of arguments for action_hook depending on vagrant version - if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('2.2.11') + if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('2.2.10') return name, action end