From ab1ffee995aafae7faebe10c1f80af3b88735b58 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 17 May 2024 14:43:14 +0200 Subject: [PATCH] modulesync 7.5.0 --- .github/CONTRIBUTING.md | 16 +++++++++++++--- .github/workflows/ci.yml | 4 +--- .github/workflows/release.yml | 2 +- .gitignore | 2 ++ .msync.yml | 2 +- .puppet-lint.rc | 2 -- .sync.yml | 5 +++++ Gemfile | 2 +- Rakefile | 2 +- 9 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 .sync.yml diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6aaa603f..88093274 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by running: ```sh -bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)" +bundle config set --local path '.vendor/' +bundle config set --local without 'development system_tests release' +bundle install --jobs "$(nproc)" ``` If you also want to run acceptance tests: ```sh -bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)" +bundle config set --local path '.vendor/' +bundle config set --local without 'development release' +bundle config set --local with 'system_tests' +bundle install --jobs "$(nproc)" ``` Our all in one solution if you don't know if you need to install or update gems: ```sh -bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean +bundle config set --local path '.vendor/' +bundle config set --local without 'development release' +bundle config set --local with 'system_tests' +bundle install --jobs "$(nproc)" +bundle update +bundle clean ``` As an alternative to the `--jobs "$(nproc)` parameter, you can set an diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7216724f..2974af38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,4 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 - with: - pidfile_workaround: 'false' + uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74ed24f7..55324aa6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: name: Release uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 with: - allowed_owner: 'icinga' + allowed_owner: 'voxpupuli' secrets: # Configure secrets here: # https://docs.github.com/en/actions/security-guides/encrypted-secrets diff --git a/.gitignore b/.gitignore index 84fd904c..adea1b01 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 f46ee025..ade23f9e 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: '7.3.0' +modulesync_config_version: '7.5.0' diff --git a/.puppet-lint.rc b/.puppet-lint.rc index dd8272c7..02a3e71d 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,3 +1 @@ --fail-on-warnings ---no-parameter_documentation-check ---no-parameter_types-check diff --git a/.sync.yml b/.sync.yml new file mode 100644 index 00000000..130aaeb3 --- /dev/null +++ b/.sync.yml @@ -0,0 +1,5 @@ +--- +.puppet-lint.rc: + enabled_lint_checks: + - parameter_documentation + - parameter_types diff --git a/Gemfile b/Gemfile index a4a3b204..2782e19c 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 7.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 3.5', :require => false + gem 'puppet_metadata', '~> 4.0', :require => false end group :development do diff --git a/Rakefile b/Rakefile index 98fdb43e..ea7491a8 100644 --- a/Rakefile +++ b/Rakefile @@ -26,7 +26,7 @@ begin rescue LoadError # voxpupuli-release not present else - GCGConfig.user = 'icinga' + GCGConfig.user = 'voxpupuli' GCGConfig.project = 'puppet-icingaweb2' end