Skip to content

Commit d7d3ae9

Browse files
committed
Update from voxpupuli modulesync_config
1 parent 9bed88f commit d7d3ae9

13 files changed

+29
-27
lines changed

.github/labeler.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
skip-changelog:
3+
- head-branch: ['^release-*', 'release']

.github/workflows/ci.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44

55
name: CI
66

7-
"on": pull_request
7+
"on":
8+
pull_request: {}
9+
push:
10+
branches:
11+
- main
12+
- master
813

914
concurrency:
1015
group: ${{ github.ref_name }}
@@ -13,6 +18,4 @@ concurrency:
1318
jobs:
1419
puppet:
1520
name: Puppet
16-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
17-
with:
18-
pidfile_workaround: 'false'
21+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2

.github/workflows/pr_labels.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
with:
1212
mode: "exactly"
1313
count: 1
14-
labels: "enhancement, bug, skip-changelog"
14+
labels: "enhancement, bug, skip-changelog, backwards-incompatible"

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name: Release
1212
jobs:
1313
release:
1414
name: Release
15-
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
15+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
1616
with:
1717
allowed_owner: 'lsst-it'
1818
secrets:

.github/workflows/shellcheck.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ jobs:
1313

1414
- name: Run ShellCheck
1515
uses: ludeeus/action-shellcheck@master
16-
env:
17-
SHELLCHECK_OPTS: -x

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@
2121
.*.sw?
2222
/.yardoc/
2323
/Guardfile
24+
bolt-debug.log
25+
.rerun.json

.msync.yml

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

5-
modulesync_config_version: '7.0.0'
5+
modulesync_config_version: '9.0.0'

.overcommit.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@ PreCommit:
4343
enabled: true
4444
description: 'Runs rubocop on modified files only'
4545
command: ['bundle', 'exec', 'rubocop']
46-
PuppetLint:
46+
RakeTarget:
4747
enabled: true
48-
description: 'Runs puppet-lint on modified files only'
49-
command: ['bundle', 'exec', 'puppet-lint']
48+
description: 'Runs lint on modified files only'
49+
targets:
50+
- 'lint'
51+
command: ['bundle', 'exec', 'rake']
5052
YamlSyntax:
5153
enabled: true
5254
JsonSyntax:

.pmtignore

+1
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@
3535
/.yardoc/
3636
/.yardopts
3737
/Dockerfile
38+
/HISTORY.md

.rspec

-5
This file was deleted.

.rspec_parallel

-4
This file was deleted.

Gemfile

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 7.0', :require => false
7+
gem 'voxpupuli-test', '~> 8.0', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
10-
gem 'puppet_metadata', '~> 3.0', :require => false
10+
gem 'puppet_metadata', '~> 4.0', :require => false
1111
gem 'puppet-lint-package_ensure-check', :require => false
1212
gem 'puppet-lint-resource_reference_syntax', :require => false
1313
gem 'puppet-lint-strict_indent-check', :require => false
@@ -21,13 +21,11 @@ group :development do
2121
end
2222

2323
group :system_tests do
24-
gem 'voxpupuli-acceptance', '~> 2.0', :require => false
24+
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
2525
end
2626

2727
group :release do
28-
gem 'github_changelog_generator', '>= 1.16.1', :require => false
29-
gem 'voxpupuli-release', '~> 3.0', :require => false
30-
gem 'faraday-retry', '~> 2.1', :require => false
28+
gem 'voxpupuli-release', '~> 3.0', :require => false
3129
end
3230

3331
gem 'rake', :require => false

spec/spec_helper.rb

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
require 'voxpupuli/test/spec_helper'
1111

12+
RSpec.configure do |c|
13+
c.facterdb_string_keys = false
14+
end
15+
1216
add_mocked_facts!
1317

1418
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))

0 commit comments

Comments
 (0)