Skip to content

Commit 9dc5edd

Browse files
Merge pull request #48 from mhashizume/PA-6049/main/release-prep
Release prep housekeeping
2 parents 0cdf85f + 95e4ce3 commit 9dc5edd

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

.sync.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ Gemfile:
1717
from_env: BEAKER_HOSTGENERATOR_VERSION
1818
- gem: beaker-rspec
1919
from_env: BEAKER_RSPEC_VERSION
20+
# Prevent beaker-puppet from being installed on Ruby > 3.1 until beaker-puppet supports newer Rubies (PA-6136)
2021
- gem: beaker-puppet
2122
from_env: BEAKER_PUPPET_VERSION
2223
version: '~> 3.0'
24+
condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2325
- gem: async
2426
version: '~> 1'
2527
- gem: beaker-module_install_helper
@@ -41,4 +43,5 @@ appveyor.yml:
4143
# We still use the Vox acceptance Rake task instead of Litmus
4244
Rakefile:
4345
requires:
44-
- voxpupuli/acceptance/rake
46+
- require: voxpupuli/acceptance/rake
47+
conditional: Gem.loaded_specs.key? 'voxpupuli-acceptance'

.vscode/extensions.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"puppet.puppet-vscode",
4+
"rebornix.Ruby"
5+
]
6+
}

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ group :development do
4040
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0')
4141
gem "beaker-hostgenerator"
4242
gem "beaker-rspec"
43-
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3.0')
43+
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3.0') if Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
4444
gem "async", '~> 1', require: false
4545
gem "beaker-module_install_helper", require: false
4646
gem "beaker-puppet_install_helper", require: false
File renamed without changes.

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
66
require 'puppet-syntax/tasks/puppet-syntax'
77
require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
88
require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
9-
require 'voxpupuli/acceptance/rake'
9+
require 'voxpupuli/acceptance/rake' if Gem.loaded_specs.key? 'voxpupuli-acceptance'
1010

1111
def changelog_user
1212
return unless Rake.application.top_level_tasks.include? "changelog"

0 commit comments

Comments
 (0)