From 17f0c4b98442755d181a94d67bad3befa752d4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 20 Aug 2025 09:02:04 -1000 Subject: [PATCH] Sync with VoxPupuli --- .github/workflows/main.yml | 9 ++++++--- Gemfile | 2 +- config_defaults.yml | 14 ++++++-------- moduleroot/.github/workflows/ci.yml.erb | 3 +++ moduleroot/.github/workflows/labeler.yml.erb | 4 ++++ moduleroot/.github/workflows/release.yml.erb | 3 +++ moduleroot/.msync.yml.erb | 2 +- moduleroot/Gemfile.erb | 4 +--- moduleroot/Rakefile.erb | 14 +++----------- 9 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b77ac82..edbb20e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: @@ -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: @@ -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: diff --git a/Gemfile b/Gemfile index 4aeb987..19c43ba 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/config_defaults.yml b/config_defaults.yml index 74c7e4b..22889f5 100644 --- a/config_defaults.yml +++ b/config_defaults.yml @@ -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 @@ -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 @@ -124,6 +124,8 @@ spec/spec.opts: delete: true CONTRIBUTING.md: delete: true +.github/CONTRIBUTING.md: + delete: true .yardopts: delete: true .gitlab-ci.yml: @@ -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: diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb index 82fac5a..15fe577 100644 --- a/moduleroot/.github/workflows/ci.yml.erb +++ b/moduleroot/.github/workflows/ci.yml.erb @@ -17,6 +17,9 @@ concurrency: group: ${{ github.ref_name }} cancel-in-progress: true +permissions: + contents: read + jobs: puppet: name: Puppet diff --git a/moduleroot/.github/workflows/labeler.yml.erb b/moduleroot/.github/workflows/labeler.yml.erb index 73be88d..eacd0b3 100644 --- a/moduleroot/.github/workflows/labeler.yml.erb +++ b/moduleroot/.github/workflows/labeler.yml.erb @@ -8,6 +8,10 @@ name: "Pull Request Labeler" on: pull_request_target: {} +permissions: + contents: read + pull-requests: write + jobs: labeler: permissions: diff --git a/moduleroot/.github/workflows/release.yml.erb b/moduleroot/.github/workflows/release.yml.erb index 18b49ef..9b4c64c 100644 --- a/moduleroot/.github/workflows/release.yml.erb +++ b/moduleroot/.github/workflows/release.yml.erb @@ -10,6 +10,9 @@ on: tags: - '*' +permissions: + contents: write + jobs: release: name: Release diff --git a/moduleroot/.msync.yml.erb b/moduleroot/.msync.yml.erb index 32df814..cf1792b 100644 --- a/moduleroot/.msync.yml.erb +++ b/moduleroot/.msync.yml.erb @@ -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' diff --git a/moduleroot/Gemfile.erb b/moduleroot/Gemfile.erb index 05283c8..fe1c026 100644 --- a/moduleroot/Gemfile.erb +++ b/moduleroot/Gemfile.erb @@ -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 diff --git a/moduleroot/Rakefile.erb b/moduleroot/Rakefile.erb index 0f378b2..50dbddb 100644 --- a/moduleroot/Rakefile.erb +++ b/moduleroot/Rakefile.erb @@ -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] %>'