diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd8418b..06ee271 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,6 @@ name: CI on: pull_request: - schedule: - - cron: '4 4 * * *' concurrency: @@ -14,7 +12,7 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 with: pidfile_workaround: 'false' rubocop: false diff --git a/.gitignore b/.gitignore index 77892f5..a5f47aa 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,8 @@ vendor/ .ruby-* ## rspec -spec/fixtures/ +spec/fixtures/manifests +spec/fixtures/modules junit/ ## Puppet module diff --git a/Gemfile b/Gemfile index 89f86f8..372152d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,24 +3,16 @@ source 'https://rubygems.org' -gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '>= 5.5', groups: ['development', 'test'] +gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test'] gem 'rake' gem 'kafo_module_lint', {"groups"=>["test"]} -gem 'puppet-lint-empty_string-check', {"groups"=>["test"]} -gem 'puppet-lint-file_ensure-check', {"groups"=>["test"]} -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', '~> 5.0', {"groups"=>["test"]} +gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]} +gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]} gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]} -gem 'puppet_metadata', '~> 1.3' +gem 'puppet_metadata', '~> 3.3' gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]} -gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]} +gem 'voxpupuli-acceptance', '~> 2.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