From 4cfc23c059e03d0ca89fb15aec15f7c66ed0445d Mon Sep 17 00:00:00 2001
From: Steffen Zieger <github@saz.sh>
Date: Sun, 19 May 2024 16:02:24 +0200
Subject: [PATCH] Update from modulesync_config

---
 .github/workflows/ci.yml      | 11 +++++++----
 .github/workflows/release.yml |  2 +-
 .gitignore                    |  2 ++
 .msync.yml                    |  2 +-
 .pmtignore                    |  1 +
 Dockerfile                    | 24 ------------------------
 Gemfile                       | 10 ++++------
 spec/spec_helper.rb           |  1 +
 8 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a07791..1f82c4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,12 @@
 
 name: CI
 
-on: pull_request
+on:
+  pull_request: {}
+  push:
+    branches:
+      - main
+      - master
 
 concurrency:
   group: ${{ github.ref_name }}
@@ -13,6 +18,4 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
-    with:
-      pidfile_workaround: 'false'
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0fc788e..af643fa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'saz'
     secrets:
diff --git a/.gitignore b/.gitignore
index 84fd904..adea1b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 .*.sw?
 /.yardoc/
 /Guardfile
+bolt-debug.log
+.rerun.json
diff --git a/.msync.yml b/.msync.yml
index a4b0069..ade23f9 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: '5.5.0'
+modulesync_config_version: '7.5.0'
diff --git a/.pmtignore b/.pmtignore
index 58a0408..10b9830 100644
--- a/.pmtignore
+++ b/.pmtignore
@@ -35,3 +35,4 @@
 /.yardoc/
 /.yardopts
 /Dockerfile
+/HISTORY.md
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 8dd82d6..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# MANAGED BY MODULESYNC
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
-FROM ruby:2.7
-
-WORKDIR /opt/puppet
-
-# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
-RUN mkdir -p /etc/sv
-
-ARG PUPPET_GEM_VERSION="~> 6.0"
-ARG PARALLEL_TEST_PROCESSORS=4
-
-# Cache gems
-COPY Gemfile .
-RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle}
-
-COPY . .
-
-RUN bundle install
-RUN bundle exec rake release_checks
-
-# Container should not saved
-RUN exit 1
diff --git a/Gemfile b/Gemfile
index 0d3a9e0..2782e19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 2.0',  :require => false
+  gem 'puppet_metadata', '~> 4.0',  :require => false
 end
 
 group :development do
@@ -16,13 +16,11 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '~> 2.0',              :require => false
-  gem 'faraday-retry', '~> 2.1',                  :require => false if RUBY_VERSION >= '2.6'
+  gem 'voxpupuli-release', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6515b7b..9efb4ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }