Showing with 39 additions and 11 deletions.
  1. +1 −3 .fixtures.yml
  2. +1 −1 .github/workflows/ci.yml
  3. +9 −0 CHANGELOG.md
  4. +5 −1 Gemfile
  5. +19 −3 Rakefile
  6. +4 −3 metadata.json
4 changes: 1 addition & 3 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
fixtures:
repositories:
augeas_core:
repo: 'https://github.com/puppetlabs/puppetlabs-augeas_core'
puppet_version: '>= 6.0.0'
augeas_core: 'https://github.com/puppetlabs/puppetlabs-augeas_core'
stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib'
xinetd: 'git://github.com/puppetlabs/puppetlabs-xinetd'
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
puppet_major_versions: ${{ steps.get_outputs.outputs.puppet_major_versions }}
puppet_unit_test_matrix: ${{ steps.get_outputs.outputs.puppet_unit_test_matrix }}
env:
BUNDLE_WITHOUT: development:release
BUNDLE_WITHOUT: development:system_tests:release
steps:
- uses: actions/checkout@v2
- name: Setup ruby
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [7.1.0](https://github.com/theforeman/puppet-tftp/tree/7.1.0) (2022-02-03)

[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/7.0.0...7.1.0)

**Implemented enhancements:**

- puppetlabs/stdlib: Allow 8.x [\#129](https://github.com/theforeman/puppet-tftp/pull/129) ([bastelfreak](https://github.com/bastelfreak))
- Add Debian 11 support [\#125](https://github.com/theforeman/puppet-tftp/pull/125) ([ekohl](https://github.com/ekohl))

## [7.0.0](https://github.com/theforeman/puppet-tftp/tree/7.0.0) (2021-07-23)

[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/6.0.0...7.0.0)
Expand Down
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
gem 'voxpupuli-test', '~> 1.4'
gem 'voxpupuli-test', '~> 1.4', {"groups"=>["test"]}
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
gem 'puppet_metadata', '~> 0.3'
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}

# Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4)
gem 'rdoc', '< 6.4'

# vim:ft=ruby
22 changes: 19 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
# This file is managed centrally by modulesync
# https://github.com/theforeman/foreman-installer-modulesync

require 'voxpupuli/test/rake'
# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
# otherwise attempt to load it directly.
begin
require 'voxpupuli/test/rake'
rescue LoadError
begin
require 'puppetlabs_spec_helper/rake_tasks'
rescue LoadError
end
end

# We use fixtures in our modules, which is not the default
task :beaker => 'spec_prep'
# load optional tasks for acceptance
# only available if gem group releases is installed
begin
require 'voxpupuli/acceptance/rake'
rescue LoadError
else
# We use fixtures in our modules, which is not the default
task :beaker => 'spec_prep'
end

# blacksmith isn't always present, e.g. on Travis with --without development
begin
Expand Down
7 changes: 4 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-tftp",
"version": "7.0.0",
"version": "7.1.0",
"author": "theforeman",
"summary": "TFTP server configuration",
"license": "GPL-3.0+",
Expand All @@ -16,7 +16,7 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.13.1 < 8.0.0"
"version_requirement": ">= 4.13.1 < 9.0.0"
},
{
"name": "puppetlabs/xinetd",
Expand Down Expand Up @@ -61,7 +61,8 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"9",
"10"
"10",
"11"
]
},
{
Expand Down