Skip to content

Commit 4579d5e

Browse files
authored
Merge pull request #41 from lsst-it/modulesync
Update from voxpupuli modulesync_config 9.7.0
2 parents e5e3ca6 + 86a55ab commit 4579d5e

File tree

8 files changed

+32
-30
lines changed

8 files changed

+32
-30
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ concurrency:
1616
group: ${{ github.ref_name }}
1717
cancel-in-progress: true
1818

19+
permissions:
20+
contents: read
21+
1922
jobs:
2023
puppet:
2124
name: Puppet

.github/workflows/labeler.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ name: "Pull Request Labeler"
88
on:
99
pull_request_target: {}
1010

11+
permissions:
12+
contents: read
13+
pull-requests: write
14+
1115
jobs:
1216
labeler:
1317
permissions:

.github/workflows/prepare_release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
1212
required: false
1313

14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
1418
jobs:
1519
release_prep:
1620
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
tags:
1111
- '*'
1212

13+
permissions:
14+
contents: write
15+
1316
jobs:
1417
release:
1518
name: Release

.msync.yml

Lines changed: 1 addition & 1 deletion
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: '9.5.0'
5+
modulesync_config_version: '10.3.0'

Gemfile

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

66
group :test do
7-
gem 'voxpupuli-test', '~> 9.0', :require => false
8-
gem 'coveralls', :require => false
9-
gem 'simplecov-console', :require => false
7+
gem 'voxpupuli-test', '~> 13.0', :require => false
108
gem 'puppet_metadata', '~> 5.0', :require => false
119
gem 'puppet-lint-package_ensure-check', :require => false
1210
gem 'puppet-lint-resource_reference_syntax', :require => false
@@ -21,17 +19,15 @@ group :development do
2119
end
2220

2321
group :system_tests do
24-
gem 'voxpupuli-acceptance', '~> 3.5', :require => false
22+
gem 'voxpupuli-acceptance', '~> 4.0', :require => false
2523
end
2624

2725
group :release do
28-
gem 'voxpupuli-release', '~> 3.0', :require => false
26+
gem 'voxpupuli-release', '~> 5.0', :require => false
2927
end
3028

3129
gem 'rake', :require => false
32-
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
3330

34-
puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
35-
gem 'puppet', puppetversion, :require => false, :groups => [:test]
31+
gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', [">= 7", "< 9"]), :require => false, :groups => [:test]
3632

3733
# vim: syntax=ruby

Rakefile

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

4-
# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper),
5-
# otherwise attempt to load it directly.
64
begin
75
require 'voxpupuli/test/rake'
86
rescue LoadError
9-
begin
10-
require 'puppetlabs_spec_helper/rake_tasks'
11-
rescue LoadError
12-
end
7+
# only available if gem group test is installed
138
end
149

15-
# load optional tasks for acceptance
16-
# only available if gem group releases is installed
1710
begin
1811
require 'voxpupuli/acceptance/rake'
1912
rescue LoadError
13+
# only available if gem group acceptance is installed
2014
end
2115

22-
# load optional tasks for releases
23-
# only available if gem group releases is installed
2416
begin
2517
require 'voxpupuli/release/rake_tasks'
2618
rescue LoadError
27-
# voxpupuli-release not present
19+
# only available if gem group releases is installed
2820
else
2921
GCGConfig.user = 'lsst-it'
3022
GCGConfig.project = 'puppet-maven'

manifests/init.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
}
2626

2727
ensure_resources('file', {
28-
$base_path => {
29-
ensure => directory,
30-
owner => 'root',
31-
group => 'root',
32-
mode => '0755',
33-
purge => true, # rm any other version
34-
force => true,
35-
recurse => true,
36-
backup => false,
37-
},
28+
$base_path => {
29+
ensure => directory,
30+
owner => 'root',
31+
group => 'root',
32+
mode => '0755',
33+
purge => true, # rm any other version
34+
force => true,
35+
recurse => true,
36+
backup => false,
37+
},
3838
})
3939

4040
archive { "/tmp/${tar_file}":

0 commit comments

Comments
 (0)