From b50e73d4e0402461e1242f5d16663335ef24acf1 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 5 Feb 2025 10:03:23 +0100 Subject: [PATCH 1/8] modulesync 9.4.0 --- .github/workflows/prepare_release.yml | 23 +++++++++++++++++++++++ .github/workflows/release.yml | 7 ------- .msync.yml | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/prepare_release.yml diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml new file mode 100644 index 0000000..01efa1a --- /dev/null +++ b/.github/workflows/prepare_release.yml @@ -0,0 +1,23 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +name: 'Prepare Release' + +on: + workflow_dispatch: + inputs: + version: + description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)' + required: false + +jobs: + release_prep: + uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3' + with: + version: ${{ github.event.inputs.version }} + allowed_owner: 'voxpupuli' + secrets: + # Configure secrets here: + # https://docs.github.com/en/actions/security-guides/encrypted-secrets + github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4adf65c..3db60fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,10 +21,3 @@ jobs: # https://docs.github.com/en/actions/security-guides/encrypted-secrets username: ${{ secrets.PUPPET_FORGE_USERNAME }} api_key: ${{ secrets.PUPPET_FORGE_API_KEY }} - - create-github-release: - name: Create GitHub Release - runs-on: ubuntu-latest - steps: - - name: Create GitHub release - uses: voxpupuli/gha-create-a-github-release@v1 diff --git a/.msync.yml b/.msync.yml index ac84b45..36e892e 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.3.0' +modulesync_config_version: '9.4.0' From c208ce8ed85647f16292473c9002a9c10bd986d2 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Wed, 19 Mar 2025 13:01:58 +0000 Subject: [PATCH 2/8] modulesync 9.5.0-4-g2cf9dc0 --- .msync.yml | 2 +- Gemfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.msync.yml b/.msync.yml index 36e892e..32df814 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.4.0' +modulesync_config_version: '9.5.0' diff --git a/Gemfile b/Gemfile index 0769fcd..ff00874 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 9.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 4.0', :require => false + gem 'puppet_metadata', '~> 5.0', :require => false gem 'ruby-augeas', :require => false end @@ -17,7 +17,7 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 3.0', :require => false + gem 'voxpupuli-acceptance', '~> 3.5', :require => false end group :release do From ca788aa5e6ab7dd937467d3aaf3443b3f3bd2181 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Wed, 28 May 2025 13:47:33 +0000 Subject: [PATCH 3/8] modulesync 9.5.0-17-g9668c96 --- .msync.yml | 2 +- Gemfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.msync.yml b/.msync.yml index 32df814..c073491 100644 --- a/.msync.yml +++ b/.msync.yml @@ -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: '9.6.0' diff --git a/Gemfile b/Gemfile index ff00874..14ae371 100644 --- a/Gemfile +++ b/Gemfile @@ -4,9 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 9.0', :require => false - gem 'coveralls', :require => false - gem 'simplecov-console', :require => false + gem 'voxpupuli-test', '~> 10.0', :require => false gem 'puppet_metadata', '~> 5.0', :require => false gem 'ruby-augeas', :require => false end From 5523d09a3d42ff5b7d721aca897f0eee0d098af2 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Wed, 28 May 2025 15:34:27 +0000 Subject: [PATCH 4/8] modulesync 9.6.0-4-gdb4d91b --- .msync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.msync.yml b/.msync.yml index c073491..b86acb8 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.6.0' +modulesync_config_version: '9.7.0' From 00e012f5f25ff07602fd8b80b1003870f1985c23 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Fri, 13 Jun 2025 06:58:30 +0000 Subject: [PATCH 5/8] modulesync 9.7.0-10-g2151f5f --- .github/workflows/ci.yml | 3 +++ .github/workflows/labeler.yml | 4 ++++ .github/workflows/prepare_release.yml | 4 ++++ .github/workflows/release.yml | 3 +++ .msync.yml | 2 +- Gemfile | 8 +++----- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7a4c39..b873975 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,9 @@ concurrency: group: ${{ github.ref_name }} cancel-in-progress: true +permissions: + contents: read + jobs: puppet: name: Puppet diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 73be88d..eacd0b3 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -8,6 +8,10 @@ name: "Pull Request Labeler" on: pull_request_target: {} +permissions: + contents: read + pull-requests: write + jobs: labeler: permissions: diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 01efa1a..2e3cc68 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -11,6 +11,10 @@ on: description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)' required: false +permissions: + contents: write + pull-requests: write + jobs: release_prep: uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3db60fb..0a8b1b1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,9 @@ on: tags: - '*' +permissions: + contents: write + jobs: release: name: Release diff --git a/.msync.yml b/.msync.yml index b86acb8..af9a220 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.7.0' +modulesync_config_version: '10.0.0' diff --git a/Gemfile b/Gemfile index 14ae371..424b5ae 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 10.0', :require => false + gem 'voxpupuli-test', '~> 11.0', :require => false gem 'puppet_metadata', '~> 5.0', :require => false gem 'ruby-augeas', :require => false end @@ -19,13 +19,11 @@ group :system_tests do end group :release do - gem 'voxpupuli-release', '~> 3.0', :require => false + gem 'voxpupuli-release', '~> 4.0', :require => false end gem 'rake', :require => false -gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"] -gem 'puppet', puppetversion, :require => false, :groups => [:test] +gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', [">= 7", "< 9"]), :require => false, :groups => [:test] # vim: syntax=ruby From 80dbff0a300b4dfeb1febae72aeb42a3f67b4d51 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Tue, 12 Aug 2025 07:54:06 +0000 Subject: [PATCH 6/8] modulesync 10.0.0-19-g1adc8e0 --- .msync.yml | 2 +- Gemfile | 2 +- Rakefile | 14 +++----------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.msync.yml b/.msync.yml index af9a220..cf1792b 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '10.0.0' +modulesync_config_version: '10.1.0' diff --git a/Gemfile b/Gemfile index 424b5ae..028a647 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 3.5', :require => false + gem 'voxpupuli-acceptance', '~> 4.0', :require => false end group :release do diff --git a/Rakefile b/Rakefile index a7c9aca..16a37c6 100644 --- a/Rakefile +++ b/Rakefile @@ -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 = 'voxpupuli' GCGConfig.project = 'puppet-augeasproviders_base' From 03d84dfd480700cd044090a41f4342c59177f430 Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Fri, 15 Aug 2025 10:12:08 +0200 Subject: [PATCH 7/8] fix: inline my_fixture method from PSH --- spec/support/spec/psh_fixtures.rb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 spec/support/spec/psh_fixtures.rb diff --git a/spec/support/spec/psh_fixtures.rb b/spec/support/spec/psh_fixtures.rb new file mode 100644 index 0000000..5c6c319 --- /dev/null +++ b/spec/support/spec/psh_fixtures.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +def fixtures(*rest) + File.join('spec', 'fixtures', *rest) +end + +# Returns the path to your relative fixture dir. So if your spec test is +# /spec/unit/facter/foo_spec.rb then your relative dir will be +# /spec/fixture/unit/facter/foo +def my_fixture_dir + callers = caller + while (line = callers.shift) + next unless (found = line.match(%r{/spec/(.*)_spec\.rb:})) + + return fixtures(found[1]) + end + raise "sorry, I couldn't work out your path from the caller stack!" +end + +# Given a name, returns the full path of a file from your relative fixture +# dir as returned by my_fixture_dir. +def my_fixture(name) + file = File.join(my_fixture_dir, name) + raise "fixture '#{name}' for #{my_fixture_dir} is not readable" unless File.readable? file + + file +end From da8b4ea5fdd55ea0af475e175af07d5c270e0be2 Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Sun, 3 Aug 2025 16:15:29 +0200 Subject: [PATCH 8/8] Drop puppet, update openvox minimum version to 8.19 * drop support for puppet as discussed in [1] * update openvox minimum version to 8.19.0 as discussed in [2] and [3] [1] https://github.com/voxpupuli/community-triage/issues/59 [2] https://github.com/voxpupuli/community-triage/issues/60 [3] https://github.com/voxpupuli/modulesync_config/pull/978#discussion_r2232830327 --- metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index 8fbb27f..63b8c6b 100644 --- a/metadata.json +++ b/metadata.json @@ -40,8 +40,8 @@ ], "requirements": [ { - "name": "puppet", - "version_requirement": ">= 7.0.0 < 9.0.0" + "name": "openvox", + "version_requirement": ">= 8.19.0 < 9.0.0" } ] }