From 5e629ee3a541bdb6416710bfbabfe95e2b63bdd1 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 17 May 2024 14:42:53 +0200 Subject: [PATCH] modulesync 7.5.0 --- .github/CONTRIBUTING.md | 16 +++++++++++++--- .github/workflows/ci.yml | 7 ++++++- .github/workflows/release.yml | 2 +- .gitignore | 2 ++ .msync.yml | 2 +- .pmtignore | 1 + .puppet-lint.rc | 2 -- .rubocop.yml | 3 +-- .sync.yml | 5 +++++ Rakefile | 2 +- 10 files changed, 31 insertions(+), 11 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 05b28633..2974af38 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 }} 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 dd3e9572..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.0.0' +modulesync_config_version: '7.5.0' diff --git a/.pmtignore b/.pmtignore index 58a04088..10b98306 100644 --- a/.pmtignore +++ b/.pmtignore @@ -35,3 +35,4 @@ /.yardoc/ /.yardopts /Dockerfile +/HISTORY.md 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/.rubocop.yml b/.rubocop.yml index ea22bff8..fded90cf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,8 +1,7 @@ --- -inherit_from: .rubocop_todo.yml - # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ +inherit_from: .rubocop_todo.yml inherit_gem: voxpupuli-test: rubocop.yml 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/Rakefile b/Rakefile index 565196b1..ea1dfeac 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-icinga2' end