Skip to content

Commit dd3efd6

Browse files
authored
Merge pull request #73 from opus-codium/switch-to-openvox
2 parents bc8c2df + 10d4047 commit dd3efd6

File tree

10 files changed

+35
-33
lines changed

10 files changed

+35
-33
lines changed

.fixtures.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1+
---
12
fixtures:
23
repositories:
3-
apache: "https://github.com/puppetlabs/puppetlabs-apache"
4-
concat: "https://github.com/puppetlabs/puppetlabs-concat"
5-
cron_core:
6-
repo: "https://github.com/puppetlabs/puppetlabs-cron_core"
7-
puppet_version: '>= 6.0.0'
8-
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib"
9-
vcsrepo:
10-
repo: "https://github.com/puppetlabs/puppetlabs-vcsrepo"
11-
# Version 6.0.0 dropped support for Puppet 6
12-
# TODO: remove specific version selection when we drop support for Puppet 6
13-
ref: "v5.5.0"
14-
symlinks:
15-
dehydrated: "#{source_dir}"
4+
apache: https://github.com/puppetlabs/puppetlabs-apache.git
5+
concat: https://github.com/puppetlabs/puppetlabs-concat.git
6+
cron_core: https://github.com/puppetlabs/puppetlabs-cron_core.git
7+
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
8+
vcsrepo: https://github.com/puppetlabs/puppetlabs-vcsrepo.git

.github/workflows/ci.yml

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

18+
permissions:
19+
contents: read
20+
1821
jobs:
1922
puppet:
2023
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/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.1.0'

.rspec

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
4+
--format documentation
5+
--color

.rspec_parallel

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

Gemfile

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

66
group :test do
7-
gem 'voxpupuli-test', '~> 9.0', :require => false
7+
gem 'voxpupuli-test', '~> 11.0', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
1010
gem 'puppet_metadata', '~> 5.0', :require => false
@@ -16,17 +16,15 @@ group :development do
1616
end
1717

1818
group :system_tests do
19-
gem 'voxpupuli-acceptance', '~> 3.5', :require => false
19+
gem 'voxpupuli-acceptance', '~> 4.0', :require => false
2020
end
2121

2222
group :release do
23-
gem 'voxpupuli-release', '~> 3.0', :require => false
23+
gem 'voxpupuli-release', '~> 4.0', :require => false
2424
end
2525

2626
gem 'rake', :require => false
27-
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
2827

29-
puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
30-
gem 'puppet', puppetversion, :require => false, :groups => [:test]
28+
gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', [">= 7", "< 9"]), :require => false, :groups => [:test]
3129

3230
# 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 = 'opus-codium'
3022
GCGConfig.project = 'puppet-dehydrated'

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
],
4343
"requirements": [
4444
{
45-
"name": "puppet",
46-
"version_requirement": ">= 7.0.0 < 9.0.0"
45+
"name": "openvox",
46+
"version_requirement": ">= 8.19.0 < 9.0.0"
4747
}
4848
],
4949
"description": "The dehydrated module lets you use Puppet to manage Let's Encrypt certificates creation and renewal using dehydrated."

0 commit comments

Comments
 (0)