Merge pull request #75 from opus-codium/sync-with-voxpupuli

Sync with VoxPupuli
opus-codium · Sep 30, 2024 · 78c2a42 · 78c2a42
2 parents 54ead98 + e3eb816
commit 78c2a42
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 5 deletions.
diff --git a/moduleroot/.github/labeler.yml.erb b/moduleroot/.github/labeler.yml.erb
@@ -1,3 +1,8 @@
 ---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+modulesync:
+ - head-branch: ['modulesync']
 skip-changelog:
  - head-branch: ['^release-*', 'release']
diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
@@ -4,6 +4,7 @@
 
 name: CI
 
+# yamllint disable-line rule:truthy
 on:
   pull_request: {}
   push:
@@ -20,9 +21,9 @@ jobs:
   puppet:
     name: Puppet
 <%- if @configs['acceptance_tests'] && Dir[File.join(@metadata[:workdir], 'spec', 'acceptance', '**', '*_spec.rb')].any? -%>
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
 <%- else -%>
-    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v3
 <%- end -%>
 <%- if @configs['with'] -%>
     with:

diff --git a/moduleroot/.github/workflows/labeler.yml → moduleroot/.github/workflows/labeler.yml.erb b/moduleroot/.github/workflows/labeler.yml → moduleroot/.github/workflows/labeler.yml.erb
@@ -1,6 +1,10 @@
 ---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 name: "Pull Request Labeler"
 
+# yamllint disable-line rule:truthy
 on:
   pull_request_target: {}
 

diff --git a/moduleroot/.github/workflows/release.yml.erb b/moduleroot/.github/workflows/release.yml.erb
@@ -4,6 +4,7 @@
 
 name: Release
 
+# yamllint disable-line rule:truthy
 on:
   push:
     tags:
@@ -12,7 +13,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
     with:
 <%- if @configs['with'] -%>
 <%- @configs['with'].each do |k,v| -%>

diff --git a/moduleroot/.pmtignore.erb b/moduleroot/.pmtignore.erb
@@ -20,6 +20,7 @@
 /.github/
 /.librarian/
 /Puppetfile.lock
+/Puppetfile
 *.iml
 /.editorconfig
 /.fixtures.yml

diff --git a/moduleroot/.puppet-lint.rc.erb b/moduleroot/.puppet-lint.rc.erb
@@ -1,3 +1,6 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 --fail-on-warnings
 <% checks = @configs['disabled_lint_checks'] - @configs['enabled_lint_checks'] -%>
 <% checks.each do |check| -%>

diff --git a/moduleroot/Gemfile.erb b/moduleroot/Gemfile.erb
@@ -35,7 +35,7 @@ end
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '<%= @configs['puppet_version'] %>'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || <%= @configs['puppet_version'].inspect %>
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
diff --git a/moduleroot/spec/spec_helper.rb.erb b/moduleroot/spec/spec_helper.rb.erb
@@ -15,7 +15,7 @@ RSpec.configure do |c|
   c.hiera_config = <%= @configs['hiera_config'] %>
 <%- end -%>
 <%- if @configs['mock_with'] -%>
-  c.mock_with = <%= @configs['mock_with'] %>
+  c.mock_with <%= @configs['mock_with'] %>
 <%- end -%>
 end
 <%- if @configs['add_mocked_facts'] -%>