Skip to content

Commit e300015

Browse files
committed
Update from voxpupuli modulesync_config
1 parent d09ac0d commit e300015

File tree

4 files changed

+105
-13
lines changed

4 files changed

+105
-13
lines changed

.github/workflows/ci.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: CI
6+
7+
on: pull_request
8+
9+
jobs:
10+
setup_matrix:
11+
name: 'Setup Test Matrix'
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 40
14+
outputs:
15+
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
16+
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
17+
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
18+
env:
19+
BUNDLE_WITHOUT: development:system_tests:release
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: Setup ruby
23+
uses: ruby/setup-ruby@v1
24+
with:
25+
ruby-version: '3.0'
26+
bundler-cache: true
27+
- name: Run static validations
28+
run: bundle exec rake validate lint check
29+
- name: Run rake rubocop
30+
run: bundle exec rake rubocop
31+
- name: Setup Test Matrix
32+
id: get-outputs
33+
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false
34+
35+
unit:
36+
needs: setup_matrix
37+
runs-on: ubuntu-latest
38+
timeout-minutes: 40
39+
strategy:
40+
fail-fast: false
41+
matrix:
42+
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
43+
env:
44+
BUNDLE_WITHOUT: development:system_tests:release
45+
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
46+
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
47+
steps:
48+
- uses: actions/checkout@v2
49+
- name: Setup ruby
50+
uses: ruby/setup-ruby@v1
51+
with:
52+
ruby-version: ${{ matrix.ruby }}
53+
bundler-cache: true
54+
- name: Run tests
55+
run: bundle exec rake parallel_spec
56+
57+
acceptance:
58+
needs: setup_matrix
59+
runs-on: ubuntu-latest
60+
env:
61+
BUNDLE_WITHOUT: development:test:release
62+
strategy:
63+
fail-fast: false
64+
matrix:
65+
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
66+
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
67+
name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
68+
steps:
69+
- uses: actions/checkout@v2
70+
- name: Setup ruby
71+
uses: ruby/setup-ruby@v1
72+
with:
73+
ruby-version: '3.0'
74+
bundler-cache: true
75+
- name: Run tests
76+
run: bundle exec rake beaker
77+
env:
78+
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
79+
BEAKER_setfile: ${{ matrix.setfile.value }}
80+
81+
tests:
82+
needs: unit, acceptance
83+
runs-on: ubuntu-latest
84+
name: Test suite
85+
steps:
86+
run: echo Test suite completed

Gemfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
source ENV['GEM_SOURCE'] || "https://rubygems.org"
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 2.1', :require => false
8-
gem 'coveralls', :require => false
9-
gem 'simplecov-console', :require => false
7+
gem 'voxpupuli-test', '~> 2.1', :require => false
8+
gem 'coveralls', :require => false
9+
gem 'simplecov-console', :require => false
10+
gem 'puppet_metadata', '~> 0.3.0', :require => false
1011
end
1112

1213
group :development do
@@ -15,8 +16,7 @@ group :development do
1516
end
1617

1718
group :system_tests do
18-
gem 'puppet_metadata', '~> 0.3.0', :require => false
19-
gem 'voxpupuli-acceptance', :require => false
19+
gem 'voxpupuli-acceptance', '~> 1.0', :require => false
2020
end
2121

2222
group :release do
@@ -26,7 +26,6 @@ group :release do
2626
gem 'puppet-strings', '>= 2.2', :require => false
2727
end
2828

29-
gem 'puppetlabs_spec_helper', '>= 2', '< 4', :require => false
3029
gem 'rake', :require => false
3130
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
3231

Rakefile

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
begin
77
require 'voxpupuli/test/rake'
88
rescue LoadError
9-
require 'puppetlabs_spec_helper/rake_tasks'
9+
begin
10+
require 'puppetlabs_spec_helper/rake_tasks'
11+
rescue LoadError
12+
end
13+
end
14+
15+
# load optional tasks for acceptance
16+
# only available if gem group releases is installed
17+
begin
18+
require 'voxpupuli/acceptance/rake'
19+
rescue LoadError
1020
end
1121

1222
# load optional tasks for releases
@@ -37,14 +47,12 @@ begin
3747
require 'github_changelog_generator/task'
3848
require 'puppet_blacksmith'
3949
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
40-
version = (Blacksmith::Modulefile.new).version
41-
config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
50+
metadata = Blacksmith::Modulefile.new
51+
config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/
4252
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
4353
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
4454
config.user = 'voxpupuli'
45-
metadata_json = File.join(File.dirname(__FILE__), 'metadata.json')
46-
metadata = JSON.load(File.read(metadata_json))
47-
config.project = metadata['name']
55+
config.project = metadata.name
4856
end
4957

5058
# Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715

spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Managed by modulesync - DO NOT EDIT
22
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
33

4-
54
# puppetlabs_spec_helper will set up coverage if the env variable is set.
65
# We want to do this if lib exists and it hasn't been explicitly set.
76
ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../../lib', __FILE__))

0 commit comments

Comments
 (0)