Skip to content

Commit 46c830e

Browse files
committed
Update from saz modulesync_config
1 parent 84f98ba commit 46c830e

15 files changed

+69
-29
lines changed

.editorconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# editorconfig.org
22

3-
# MANAGED BY MODULESYNC
3+
# Managed by modulesync - DO NOT EDIT
4+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
45

56
root = true
67

.github/workflows/ci.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: CI
26

37
on:
@@ -10,20 +14,19 @@ jobs:
1014
runs-on: ubuntu-latest
1115
timeout-minutes: 40
1216
outputs:
13-
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
14-
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
1517
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
18+
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
1619
env:
17-
BUNDLE_WITHOUT: development:release
20+
BUNDLE_WITHOUT: development:system_tests:release
1821
steps:
1922
- uses: actions/checkout@v2
2023
- name: Setup ruby
2124
uses: ruby/setup-ruby@v1
2225
with:
23-
ruby-version: '2.7'
26+
ruby-version: '3.0'
2427
bundler-cache: true
25-
- name: Run rake validate
26-
run: bundle exec rake validate
28+
- name: Run static validations
29+
run: bundle exec rake validate lint check
2730
- name: Run rake rubocop
2831
run: bundle exec rake rubocop
2932
- name: Setup Test Matrix
@@ -50,4 +53,4 @@ jobs:
5053
ruby-version: ${{ matrix.ruby }}
5154
bundler-cache: true
5255
- name: Run tests
53-
run: bundle exec rake
56+
run: bundle exec rake parallel_spec

.github/workflows/release.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: Release
26

37
on:
@@ -12,6 +16,7 @@ jobs:
1216
deploy:
1317
name: 'deploy to forge'
1418
runs-on: ubuntu-latest
19+
if: github.repository_owner == 'saz'
1520
steps:
1621
- name: Checkout repository
1722
uses: actions/checkout@v2

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
pkg/
25
Gemfile.lock
36
Gemfile.local

.msync.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
modulesync_config_version: '4.1.0'

.overcommit.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Managed by https://github.com/voxpupuli/modulesync_configs
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
23
#
34
# Hooks are only enabled if you take action.
45
#

.pmtignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
docs/
25
pkg/
36
Gemfile

.rspec

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
--format documentation
25
--color

.rspec_parallel

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
--format progress

.rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
inherit_gem:
36
voxpupuli-test: rubocop.yml

.yardopts

-2
This file was deleted.

Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# MANAGED BY MODULESYNC
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
FROM ruby:2.7
25

36
WORKDIR /opt/puppet

Gemfile

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
source ENV['GEM_SOURCE'] || "https://rubygems.org"
25

36
group :test do
4-
gem 'voxpupuli-test', '~> 2.1', :require => false
5-
gem 'coveralls', :require => false
6-
gem 'simplecov-console', :require => false
7+
gem 'voxpupuli-test', '~> 2.5', :require => false
8+
gem 'coveralls', :require => false
9+
gem 'simplecov-console', :require => false
10+
gem 'puppet_metadata', '~> 1.0', :require => false
711
end
812

913
group :development do
@@ -12,22 +16,19 @@ group :development do
1216
end
1317

1418
group :system_tests do
15-
gem 'puppet_metadata', '~> 0.3.0', :require => false
16-
gem 'voxpupuli-acceptance', :require => false
19+
gem 'voxpupuli-acceptance', '~> 1.0', :require => false
1720
end
1821

1922
group :release do
2023
gem 'github_changelog_generator', '>= 1.16.1', :require => false
21-
gem 'puppet-blacksmith', :require => false
22-
gem 'voxpupuli-release', :require => false
24+
gem 'voxpupuli-release', '>= 1.0.2', :require => false
2325
gem 'puppet-strings', '>= 2.2', :require => false
2426
end
2527

26-
gem 'puppetlabs_spec_helper', '~> 2.0', :require => false
2728
gem 'rake', :require => false
2829
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
2930

30-
puppetversion = ENV['PUPPET_VERSION'] || '~> 6.0'
31+
puppetversion = ENV['PUPPET_VERSION'] || '>= 6.0'
3132
gem 'puppet', puppetversion, :require => false, :groups => [:test]
3233

3334
# vim: syntax=ruby

Rakefile

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
25
# otherwise attempt to load it directly.
36
begin
47
require 'voxpupuli/test/rake'
58
rescue LoadError
6-
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
720
end
821

922
# load optional tasks for releases
@@ -34,14 +47,12 @@ begin
3447
require 'github_changelog_generator/task'
3548
require 'puppet_blacksmith'
3649
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
37-
version = (Blacksmith::Modulefile.new).version
38-
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+$/
3952
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."
4053
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
4154
config.user = 'saz'
42-
metadata_json = File.join(File.dirname(__FILE__), 'metadata.json')
43-
metadata = JSON.load(File.read(metadata_json))
44-
config.project = metadata['name']
55+
config.project = metadata.metadata['name']
4556
end
4657

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

spec/spec_helper.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# This file is managed via modulesync
2-
# https://github.com/voxpupuli/modulesync
3-
# https://github.com/voxpupuli/modulesync_config
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
43

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.

0 commit comments

Comments
 (0)