puppetlabs/beaker-vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/beaker-vmpooler.git synced 2026-01-26 02:58:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #34 from mhashizume/PUP-11786/main/beaker-bump

Browse source 
(PUP-11786) Beaker 5 compatibility
This commit is contained in:
Aria Li (she/her) 2024-02-14 17:20:09 -08:00 • committed by GitHub
commit c309bf02ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/testing.yml vendored
View file

@ -14,6 +14,7 @@ jobs:
- '2.7' - '2.7'
- '3.0' - '3.0'
- '3.1' - '3.1'
- '3.2'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Ruby - name: Set up Ruby

8
Gemfile
View file

@ -2,8 +2,6 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
gemspec :development_group => :acceptance_testing gemspec :development_group => :acceptance_testing
def location_for(place, fake_version = nil) def location_for(place, fake_version = nil)
if place =~ /^(git:[^#]*)#(.*)/ if place =~ /^(git:[^#]*)#(.*)/
[fake_version, { :git => $1, :branch => $2, :require => false }].compact [fake_version, { :git => $1, :branch => $2, :require => false }].compact
@ -14,15 +12,13 @@ def location_for(place, fake_version = nil)
end end
end end
# We don't put beaker in as a test dependency because we # We don't put beaker in as a test dependency because we
# don't want to create a transitive dependency # don't want to create a transitive dependency
group :acceptance_testing do group :acceptance_testing do
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0') gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5.0')
gem "beaker-abs" gem "beaker-abs"
end end
if File.exist? "#{__FILE__}.local"
if File.exists? "#{__FILE__}.local"
eval(File.read("#{__FILE__}.local"), binding) eval(File.read("#{__FILE__}.local"), binding)
end end

7
beaker-vmpooler.gemspec
View file

@ -20,12 +20,7 @@ Gem::Specification.new do |s|
# Testing dependencies # Testing dependencies
s.add_development_dependency 'rspec', '~> 3.0' s.add_development_dependency 'rspec', '~> 3.0'
s.add_development_dependency 'rspec-its' s.add_development_dependency 'rspec-its'
# pin fakefs for Ruby < 2.3 s.add_development_dependency 'fakefs', '~> 2.4'
if RUBY_VERSION < "2.3"
s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14'
else
s.add_development_dependency 'fakefs', '~> 0.6'
end
s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'simplecov' s.add_development_dependency 'simplecov'
s.add_development_dependency 'pry', '~> 0.10' s.add_development_dependency 'pry', '~> 0.10'