Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ on:
branches:
- master

permissions:
contents: read

jobs:
unit:
runs-on: ubuntu-latest
name: Run msync --noop against all modules
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -24,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
name: Run metadata_json_deps on all modules
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -37,7 +40,7 @@ jobs:
runs-on: ubuntu-latest
name: Prints a list of all modules with outdated modulesync_config version
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ group :release do
end

gem 'puppet_forge', '>= 2.2.9'
gem 'metadata_json_deps', '>= 0.2.0', '< 2'
gem 'metadata_json_deps', '>= 0.2.0', '< 3'
gem 'modulesync', '>= 2.6.0'
gem "octokit", "~> 4.0"
# vim: syntax=ruby
14 changes: 6 additions & 8 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
Jenkinsfile:
delete: true
Gemfile:
puppet_version: ['>= 7.24', '< 9']
openvox_version: ['>= 7', '< 9']
required:
':test':
- gem: voxpupuli-test
version: '~> 9.0'
version: '~> 11.0'
- gem: coveralls
- gem: simplecov-console
- gem: puppet_metadata
Expand All @@ -29,10 +29,10 @@ Gemfile:
version: '>= 0.39.1'
':system_tests':
- gem: voxpupuli-acceptance
version: '~> 3.5'
version: '~> 4.0'
':release':
- gem: voxpupuli-release
version: '~> 3.0'
version: '~> 4.0'
Rakefile:
config.user: opus-codium
# config.project: PROJECT
Expand Down Expand Up @@ -124,6 +124,8 @@ spec/spec.opts:
delete: true
CONTRIBUTING.md:
delete: true
.github/CONTRIBUTING.md:
delete: true
.yardopts:
delete: true
.gitlab-ci.yml:
Expand Down Expand Up @@ -156,10 +158,6 @@ Dockerfile:
delete: true
.pcci.yml:
delete: true
.rspec_parallel:
delete: true
.rspec:
delete: true
.devcontainer/Dockerfile:
delete: true
.devcontainer/devcontainer.json:
Expand Down
3 changes: 3 additions & 0 deletions moduleroot/.github/workflows/ci.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ concurrency:
group: ${{ github.ref_name }}
cancel-in-progress: true

permissions:
contents: read

jobs:
puppet:
name: Puppet
Expand Down
4 changes: 4 additions & 0 deletions moduleroot/.github/workflows/labeler.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ name: "Pull Request Labeler"
on:
pull_request_target: {}

permissions:
contents: read
pull-requests: write

jobs:
labeler:
permissions:
Expand Down
3 changes: 3 additions & 0 deletions moduleroot/.github/workflows/release.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
tags:
- '*'

permissions:
contents: write

jobs:
release:
name: Release
Expand Down
2 changes: 1 addition & 1 deletion moduleroot/.msync.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '9.5.0'
modulesync_config_version: '10.1.0'
4 changes: 1 addition & 3 deletions moduleroot/Gemfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ end

<% end -%>
gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]

puppetversion = ENV['PUPPET_GEM_VERSION'] || <%= @configs['puppet_version'].inspect %>
gem 'puppet', puppetversion, :require => false, :groups => [:test]
gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', <%= @configs['openvox_version'].inspect %>), :require => false, :groups => [:test]

# vim: syntax=ruby
14 changes: 3 additions & 11 deletions moduleroot/Rakefile.erb
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper),
# otherwise attempt to load it directly.
begin
require 'voxpupuli/test/rake'
rescue LoadError
begin
require 'puppetlabs_spec_helper/rake_tasks'
rescue LoadError
end
# only available if gem group test is installed
end

# load optional tasks for acceptance
# only available if gem group releases is installed
begin
require 'voxpupuli/acceptance/rake'
rescue LoadError
# only available if gem group acceptance is installed
end

# load optional tasks for releases
# only available if gem group releases is installed
begin
require 'voxpupuli/release/rake_tasks'
rescue LoadError
# voxpupuli-release not present
# only available if gem group releases is installed
else
GCGConfig.user = '<%= @configs['config.user'] || @configs[:namespace] %>'
GCGConfig.project = '<%= @configs['config.project'] || @configs[:puppet_module] %>'
Expand Down