Skip to content

Commit aeeb2ef

Browse files
authored
Merge pull request #505 from voxpupuli/modulesync
modulesync 9.2.0
2 parents 03aa045 + f3a5f35 commit aeeb2ef

9 files changed

Lines changed: 56 additions & 21 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
name: CI
66

7+
# yamllint disable-line rule:truthy
78
on:
89
pull_request: {}
910
push:
@@ -15,9 +16,12 @@ concurrency:
1516
group: ${{ github.ref_name }}
1617
cancel-in-progress: true
1718

19+
permissions:
20+
contents: read
21+
1822
jobs:
1923
puppet:
2024
name: Puppet
21-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
25+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
2226
with:
2327
beaker_facter: 'nodejs_version:NodeJS:16,18,20'

.github/workflows/labeler.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
name: "Pull Request Labeler"
66

7+
# yamllint disable-line rule:truthy
78
on:
89
pull_request_target: {}
910

11+
permissions:
12+
contents: read
13+
pull-requests: write
14+
1015
jobs:
1116
labeler:
1217
permissions:
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: 'Prepare Release'
6+
7+
on:
8+
workflow_dispatch:
9+
inputs:
10+
version:
11+
description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
12+
required: false
13+
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
jobs:
19+
release_prep:
20+
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
21+
with:
22+
version: ${{ github.event.inputs.version }}
23+
allowed_owner: 'voxpupuli'
24+
secrets:
25+
# Configure secrets here:
26+
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
27+
github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'

.github/workflows/release.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,23 @@
44

55
name: Release
66

7+
# yamllint disable-line rule:truthy
78
on:
89
push:
910
tags:
1011
- '*'
1112

13+
permissions:
14+
contents: write
15+
1216
jobs:
1317
release:
1418
name: Release
15-
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
19+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
1620
with:
1721
allowed_owner: 'voxpupuli'
1822
secrets:
1923
# Configure secrets here:
2024
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
2125
username: ${{ secrets.PUPPET_FORGE_USERNAME }}
2226
api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}
23-
24-
create-github-release:
25-
name: Create GitHub Release
26-
runs-on: ubuntu-latest
27-
steps:
28-
- name: Create GitHub release
29-
uses: voxpupuli/gha-create-a-github-release@v1

.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.1.0'
5+
modulesync_config_version: '10.0.0'

.pmtignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
/.github/
2121
/.librarian/
2222
/Puppetfile.lock
23+
/Puppetfile
2324
*.iml
2425
/.editorconfig
2526
/.fixtures.yml

.sync.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ spec/spec_helper_acceptance.rb:
66
.github/workflows/ci.yml:
77
with:
88
beaker_facter: 'nodejs_version:NodeJS:16,18,20'
9+
Gemfile:
10+
optional:
11+
':test':
12+
- gem: 'mocha'

Gemfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
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
10-
gem 'puppet_metadata', '~> 4.0', :require => false
7+
gem 'mocha', :require => false
8+
gem 'voxpupuli-test', '~> 11.0', :require => false
9+
gem 'puppet_metadata', '~> 5.0', :require => false
1110
end
1211

1312
group :development do
@@ -16,17 +15,15 @@ group :development do
1615
end
1716

1817
group :system_tests do
19-
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
18+
gem 'voxpupuli-acceptance', '~> 3.5', :require => false
2019
end
2120

2221
group :release do
23-
gem 'voxpupuli-release', '~> 3.0', :require => false
22+
gem 'voxpupuli-release', '~> 4.0', :require => false
2423
end
2524

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

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

3229
# vim: syntax=ruby

spec/unit/puppet/provider/package/npm_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def self.it_should_respond_to(*actions)
6666
it 'returns a list of npm packages installed globally' do
6767
provider.class.expects(:execute).
6868
with(['/usr/local/bin/npm', 'list', '--json', '--global'], anything).
69-
returns(Puppet::Util::Execution::ProcessOutput.new(my_fixture_read('npm_global'), 0))
69+
returns(Puppet::Util::Execution::ProcessOutput.new(File.read('spec/fixtures/unit/puppet/provider/package/npm/npm_global'), 0))
7070
expect(provider.class.instances.map(&:properties).sort_by { |res| res[:name] }).to eq([
7171
{ ensure: '2.5.9', provider: 'npm', name: 'express' },
7272
{ ensure: '1.1.15', provider: 'npm', name: 'npm' }
@@ -76,7 +76,7 @@ def self.it_should_respond_to(*actions)
7676
it 'logs and continue if the list command has a non-zero exit code' do
7777
provider.class.expects(:execute).
7878
with(['/usr/local/bin/npm', 'list', '--json', '--global'], anything).
79-
returns(Puppet::Util::Execution::ProcessOutput.new(my_fixture_read('npm_global'), 123))
79+
returns(Puppet::Util::Execution::ProcessOutput.new(File.read('spec/fixtures/unit/puppet/provider/package/npm/npm_global'), 123))
8080
Puppet.expects(:debug).with(regexp_matches(%r{123}))
8181
expect(provider.class.instances.map(&:properties)).not_to eq([])
8282
end

0 commit comments

Comments
 (0)