From a7436b10cae0e040d5fea469a91dbdd1268b1850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 20 Jun 2024 08:31:34 -1000
Subject: [PATCH] Update from Opus-Codium modulesync_config
---
.github/labeler.yml | 3 +++
.github/workflows/ci.yml | 10 ++++++----
.github/workflows/release.yml | 2 +-
.gitignore | 2 ++
.msync.yml | 5 ++++-
.pmtignore | 1 +
Gemfile | 10 ++++------
spec/spec_helper.rb | 4 ++++
8 files changed, 25 insertions(+), 12 deletions(-)
create mode 100644 .github/labeler.yml
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 0000000..7899de8
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,3 @@
+---
+skip-changelog:
+ - head-branch: ['^release-*', 'release']
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a07791..9c43c1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,11 @@
name: CI
-on: pull_request
+on:
+ pull_request: {}
+ push:
+ branches:
+ - main
concurrency:
group: ${{ github.ref_name }}
@@ -13,6 +17,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 1d0aa2f..d5e7326 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: 'opus-codium'
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 a0770a8..3607168 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1,2 +1,5 @@
---
-modulesync_config_version: '4.0.0'
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+modulesync_config_version: '9.0.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/Gemfile b/Gemfile
index db21d3b..27cdc0d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,10 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
group :test do
- gem 'voxpupuli-test', '~> 7.0', :require => false
+ gem 'voxpupuli-test', '~> 8.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
- gem 'puppet_metadata', '~> 3.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', '~> 2.0', :require => false
+ gem 'voxpupuli-acceptance', '~> 3.0', :require => false
end
group :release do
- gem 'github_changelog_generator', '>= 1.16.1', :require => false
- gem 'voxpupuli-release', '~> 3.0', :require => false
- gem 'faraday-retry', '~> 2.1', :require => false
+ 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 9efb4ae..58c9b66 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,6 +9,10 @@
require 'voxpupuli/test/spec_helper'
+RSpec.configure do |c|
+ c.facterdb_string_keys = false
+end
+
add_mocked_facts!
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))