From 35c08b78cf62cd2daf878a55752dc25a3b297d94 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Fri, 13 Jun 2025 07:11:52 +0000 Subject: [PATCH 1/2] 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 8c32acf9..44674150 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 73be88dc..eacd0b33 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 01efa1a8..2e3cc689 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 3db60fbc..0a8b1b18 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 b86acb82..af9a220d 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 f08ae17f..fc8cf4d1 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 end @@ -18,13 +18,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 5e0d878236f1171a5455c550db8e8dab11a7897e Mon Sep 17 00:00:00 2001 From: Kenyon Ralph Date: Fri, 13 Jun 2025 22:18:35 -0700 Subject: [PATCH 2/2] .fixtures.yml: remove puppet_version Not needed anymore and breaks testing with openvox. --- .fixtures.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.fixtures.yml b/.fixtures.yml index 8d63745d..0c369870 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -4,4 +4,3 @@ fixtures: epel: https://github.com/voxpupuli/puppet-epel.git yumrepo_core: repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git - puppet_version: ">= 6.0.0"