Skip to content

Commit c1c3784

Browse files
authored
Merge pull request #528 from voxpupuli/modulesync
modulesync 10.6.0
2 parents 9fd9a5c + 7d4e610 commit c1c3784

13 files changed

Lines changed: 221 additions & 177 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
21
{
32
"name": "VoxBox",
43
"image": "ghcr.io/voxpupuli/voxbox:latest"

.github/workflows/create_tag.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: Create Git tag
6+
7+
on:
8+
workflow_dispatch:
9+
10+
permissions: {}
11+
12+
jobs:
13+
create_tag:
14+
uses: 'voxpupuli/gha-puppet/.github/workflows/create_tag.yml@v4'
15+
with:
16+
allowed_owner: 'voxpupuli'
17+
git_name: 'pccibot'
18+
git_email: '[email protected]'
19+
secrets:
20+
# Configure secrets here:
21+
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
22+
ssh_private_key: ${{ secrets.PCCI_SSH_PRIVATE_KEY }}

.github/workflows/prepare_release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ permissions:
1717

1818
jobs:
1919
release_prep:
20-
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
20+
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v4'
2121
with:
2222
version: ${{ github.event.inputs.version }}
2323
allowed_owner: 'voxpupuli'
24+
git_name: 'pccibot'
25+
git_email: '[email protected]'
2426
secrets:
2527
# Configure secrets here:
2628
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
2729
github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'
30+
ssh_private_key: '${{ secrets.PCCI_SSH_PRIVATE_KEY }}'

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ name: Release
88
on:
99
push:
1010
tags:
11-
- '*'
11+
# https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#onpushbranchestagsbranches-ignoretags-ignore
12+
# https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet
13+
- 'v[0-9]+.[0-9]+.[0-9]+'
1214

1315
permissions:
1416
contents: write
1517

1618
jobs:
1719
release:
1820
name: Release
19-
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
21+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v4
2022
with:
2123
allowed_owner: 'voxpupuli'
2224
secrets:

.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: '10.5.0'
5+
modulesync_config_version: '10.7.0'

.rubocop_todo.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3-
# using RuboCop version 1.50.2.
3+
# using RuboCop version 1.85.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9+
# Offense count: 6
10+
# This cop supports unsafe autocorrection (--autocorrect-all).
11+
RSpec/IncludeExamples:
12+
Exclude:
13+
- 'spec/acceptance/class_spec.rb'
14+
15+
# Offense count: 9
16+
RSpec/LeakyLocalVariable:
17+
Exclude:
18+
- 'spec/acceptance/class_spec.rb'
19+
- 'spec/classes/nodejs_spec.rb'
20+
921
# Offense count: 10
1022
# Configuration parameters: .
1123
# SupportedStyles: have_received, receive

.sync.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
2+
Gemfile:
3+
optional:
4+
':test':
5+
- gem: 'rexml'
26
spec/spec_helper_acceptance.rb:
37
unmanaged: true
48
.github/workflows/ci.yml:

Gemfile

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

66
group :test do
7-
gem 'voxpupuli-test', '~> 13.0', :require => false
7+
gem 'voxpupuli-test', '~> 14.0', :require => false
88
gem 'puppet_metadata', '~> 6.0', :require => false
9+
gem 'rexml', :require => false
910
end
1011

1112
group :development do
@@ -18,7 +19,7 @@ group :system_tests do
1819
end
1920

2021
group :release do
21-
gem 'voxpupuli-release', '~> 5.0', :require => false
22+
gem 'voxpupuli-release', '~> 5.3', :require => false
2223
end
2324

2425
gem 'rake', :require => false

spec/acceptance/class_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
def nodesource_unsupported(nodejs_version)
66
return unless fact('os.family') == 'RedHat'
77
return 'Only NodeJS 16 is supported on EL7' if nodejs_version != '16' && fact('os.release.major') == '7'
8-
return 'NodeJS 16 is not supported on EL9' if nodejs_version == '16' && fact('os.release.major') == '9'
8+
9+
'NodeJS 16 is not supported on EL9' if nodejs_version == '16' && fact('os.release.major') == '9'
910
end
1011

1112
describe 'nodejs' do
@@ -103,7 +104,7 @@ class { 'nodejs':
103104
end
104105
end
105106

106-
context 'RedHat with repo_class => nodejs::repo::dnfmodule', if: fact('os.family') == 'RedHat' && %w[8 9].include?(fact('os.release.major')), skip: (nodejs_version == '16' && fact('os.release.major') == '9' ? 'NodeJS 16 is not available on EL9' : nil) do
107+
context 'RedHat with repo_class => nodejs::repo::dnfmodule', if: fact('os.family') == 'RedHat' && %w[8 9].include?(fact('os.release.major')), skip: ((nodejs_version == '16' && fact('os.release.major') == '9') ? 'NodeJS 16 is not available on EL9' : nil) do
107108
# Node 16 is not available on EL9
108109

109110
include_examples 'cleanup'

0 commit comments

Comments
 (0)