Skip to content

Commit 3ec0edb

Browse files
Merge pull request #72 from mhashizume/PA-6049/main/release-prep
Release prep housekeeping
2 parents 3b05cfe + 5f97f84 commit 3ec0edb

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

Diff for: .sync.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ Gemfile:
2020
from_env: BEAKER_HOSTGENERATOR_VERSION
2121
- gem: beaker-rspec
2222
from_env: BEAKER_RSPEC_VERSION
23+
# Prevent beaker-puppet from being installed on Ruby > 3.1 until beaker-puppet supports newer Rubies (PA-6136)
2324
- gem: beaker-puppet
2425
from_env: BEAKER_PUPPET_VERSION
2526
version: '~> 3'
27+
condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2628
- gem: async
2729
version: '~> 1'
2830
- gem: beaker-module_install_helper
@@ -44,4 +46,6 @@ appveyor.yml:
4446
# We still use the Vox acceptance Rake task instead of Litmus
4547
Rakefile:
4648
requires:
47-
- voxpupuli/acceptance/rake
49+
- require: voxpupuli/acceptance/rake
50+
conditional: Gem.loaded_specs.key? 'voxpupuli-acceptance'
51+

Diff for: Gemfile

+1-1
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')
4141
gem "beaker-hostgenerator"
4242
gem "beaker-rspec"
43-
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3')
43+
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3') 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.

Diff for: Rakefile

+1-1
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"

Diff for: lib/puppet/provider/cron/crontab.rb

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
require 'puppet/provider/parsedfile'
33

44
Puppet::Type.type(:cron).provide(:crontab, parent: Puppet::Provider::ParsedFile, default_target: ENV['USER'] || 'root', raise_prefetch_errors: true) do
5+
desc 'The crontab provider'
6+
57
commands crontab: 'crontab'
68

79
text_line :comment, match: %r{^\s*#}, post_parse: proc { |record|

0 commit comments

Comments
 (0)