mirror of
https://github.com/philippdieter/puppet-ldapquery.git
synced 2025-10-13 04:54:47 +00:00
modulesync 4.2.0
This commit is contained in:
parent
d252c19f0e
commit
011254f8f9
@ -1,6 +1,7 @@
|
|||||||
# editorconfig.org
|
# editorconfig.org
|
||||||
|
|
||||||
# MANAGED BY MODULESYNC
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
root = true
|
root = true
|
||||||
|
|
||||||
|
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
@ -25,7 +25,7 @@ By participating in this project you agree to abide by its terms.
|
|||||||
|
|
||||||
* Fork the repo.
|
* Fork the repo.
|
||||||
* Create a separate branch for your change.
|
* Create a separate branch for your change.
|
||||||
* We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
|
* We only take pull requests with passing tests, and documentation. [GitHub Actions](https://docs.github.com/en/actions) run the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
|
||||||
* Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
|
* Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
|
||||||
* Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
|
* Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
|
||||||
* Squash your commits down into logical components. Make sure to rebase against our current master.
|
* Squash your commits down into logical components. Make sure to rebase against our current master.
|
||||||
|
29
.github/workflows/ci.yml
vendored
29
.github/workflows/ci.yml
vendored
@ -1,27 +1,34 @@
|
|||||||
|
---
|
||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
name: CI
|
name: CI
|
||||||
|
|
||||||
on: pull_request
|
on: pull_request
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.head_ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
setup_matrix:
|
setup_matrix:
|
||||||
name: 'Setup Test Matrix'
|
name: 'Setup Test Matrix'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 40
|
timeout-minutes: 40
|
||||||
outputs:
|
outputs:
|
||||||
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
|
|
||||||
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
|
|
||||||
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
|
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
|
||||||
|
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
|
||||||
env:
|
env:
|
||||||
BUNDLE_WITHOUT: development:release
|
BUNDLE_WITHOUT: development:system_tests:release
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: Setup ruby
|
- name: Setup ruby
|
||||||
uses: ruby/setup-ruby@v1
|
uses: ruby/setup-ruby@v1
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.7'
|
ruby-version: '3.0'
|
||||||
bundler-cache: true
|
bundler-cache: true
|
||||||
- name: Run rake validate
|
- name: Run static validations
|
||||||
run: bundle exec rake validate
|
run: bundle exec rake validate lint check
|
||||||
- name: Run rake rubocop
|
- name: Run rake rubocop
|
||||||
run: bundle exec rake rubocop
|
run: bundle exec rake rubocop
|
||||||
- name: Setup Test Matrix
|
- name: Setup Test Matrix
|
||||||
@ -48,4 +55,12 @@ jobs:
|
|||||||
ruby-version: ${{ matrix.ruby }}
|
ruby-version: ${{ matrix.ruby }}
|
||||||
bundler-cache: true
|
bundler-cache: true
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: bundle exec rake
|
run: bundle exec rake parallel_spec
|
||||||
|
|
||||||
|
tests:
|
||||||
|
needs:
|
||||||
|
- unit
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Test suite
|
||||||
|
steps:
|
||||||
|
- run: echo Test suite completed
|
||||||
|
5
.github/workflows/release.yml
vendored
5
.github/workflows/release.yml
vendored
@ -1,3 +1,7 @@
|
|||||||
|
---
|
||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
name: Release
|
name: Release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
@ -12,6 +16,7 @@ jobs:
|
|||||||
deploy:
|
deploy:
|
||||||
name: 'deploy to forge'
|
name: 'deploy to forge'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: github.repository_owner == 'voxpupuli'
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,3 +1,6 @@
|
|||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
pkg/
|
pkg/
|
||||||
Gemfile.lock
|
Gemfile.lock
|
||||||
Gemfile.local
|
Gemfile.local
|
||||||
|
@ -1,2 +1,5 @@
|
|||||||
---
|
---
|
||||||
modulesync_config_version: '4.1.0'
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
|
modulesync_config_version: '4.2.0'
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
# Managed by https://github.com/voxpupuli/modulesync_configs
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
#
|
#
|
||||||
# Hooks are only enabled if you take action.
|
# Hooks are only enabled if you take action.
|
||||||
#
|
#
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
docs/
|
docs/
|
||||||
pkg/
|
pkg/
|
||||||
Gemfile
|
Gemfile
|
||||||
|
3
.rspec
3
.rspec
@ -1,2 +1,5 @@
|
|||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
--format documentation
|
--format documentation
|
||||||
--color
|
--color
|
||||||
|
@ -1 +1,4 @@
|
|||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
--format progress
|
--format progress
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
---
|
---
|
||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
inherit_gem:
|
inherit_gem:
|
||||||
voxpupuli-test: rubocop.yml
|
voxpupuli-test: rubocop.yml
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
# MANAGED BY MODULESYNC
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
FROM ruby:2.7
|
FROM ruby:2.7
|
||||||
|
|
||||||
WORKDIR /opt/puppet
|
WORKDIR /opt/puppet
|
||||||
|
15
Gemfile
15
Gemfile
@ -1,9 +1,13 @@
|
|||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem 'voxpupuli-test', '~> 2.1', :require => false
|
gem 'voxpupuli-test', '~> 2.5', :require => false
|
||||||
gem 'coveralls', :require => false
|
gem 'coveralls', :require => false
|
||||||
gem 'simplecov-console', :require => false
|
gem 'simplecov-console', :require => false
|
||||||
|
gem 'puppet_metadata', '~> 1.0', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
@ -12,14 +16,12 @@ group :development do
|
|||||||
end
|
end
|
||||||
|
|
||||||
group :system_tests do
|
group :system_tests do
|
||||||
gem 'puppet_metadata', '~> 0.3.0', :require => false
|
gem 'voxpupuli-acceptance', '~> 1.0', :require => false
|
||||||
gem 'voxpupuli-acceptance', :require => false
|
|
||||||
end
|
end
|
||||||
|
|
||||||
group :release do
|
group :release do
|
||||||
gem 'github_changelog_generator', '>= 1.16.1', :require => false
|
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
|
||||||
gem 'puppet-blacksmith', :require => false
|
gem 'voxpupuli-release', '>= 1.0.2', :require => false
|
||||||
gem 'voxpupuli-release', :require => false
|
|
||||||
gem 'puppet-strings', '>= 2.2', :require => false
|
gem 'puppet-strings', '>= 2.2', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -32,7 +34,6 @@ group :testextra do
|
|||||||
gem 'rspec-expectations', :require => false
|
gem 'rspec-expectations', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
gem 'puppetlabs_spec_helper', '~> 2.0', :require => false
|
|
||||||
gem 'rake', :require => false
|
gem 'rake', :require => false
|
||||||
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
|
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
|
||||||
|
|
||||||
|
21
Rakefile
21
Rakefile
@ -1,9 +1,22 @@
|
|||||||
|
# Managed by modulesync - DO NOT EDIT
|
||||||
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
|
|
||||||
# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
|
# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
|
||||||
# otherwise attempt to load it directly.
|
# otherwise attempt to load it directly.
|
||||||
begin
|
begin
|
||||||
require 'voxpupuli/test/rake'
|
require 'voxpupuli/test/rake'
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
|
begin
|
||||||
require 'puppetlabs_spec_helper/rake_tasks'
|
require 'puppetlabs_spec_helper/rake_tasks'
|
||||||
|
rescue LoadError
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# load optional tasks for acceptance
|
||||||
|
# only available if gem group releases is installed
|
||||||
|
begin
|
||||||
|
require 'voxpupuli/acceptance/rake'
|
||||||
|
rescue LoadError
|
||||||
end
|
end
|
||||||
|
|
||||||
# load optional tasks for releases
|
# load optional tasks for releases
|
||||||
@ -34,14 +47,12 @@ begin
|
|||||||
require 'github_changelog_generator/task'
|
require 'github_changelog_generator/task'
|
||||||
require 'puppet_blacksmith'
|
require 'puppet_blacksmith'
|
||||||
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
|
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
|
||||||
version = (Blacksmith::Modulefile.new).version
|
metadata = Blacksmith::Modulefile.new
|
||||||
config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
|
config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/
|
||||||
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
|
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
|
||||||
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
|
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
|
||||||
config.user = 'voxpupuli'
|
config.user = 'voxpupuli'
|
||||||
metadata_json = File.join(File.dirname(__FILE__), 'metadata.json')
|
config.project = metadata.metadata['name']
|
||||||
metadata = JSON.load(File.read(metadata_json))
|
|
||||||
config.project = metadata['name']
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
|
# Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
# This file is managed via modulesync
|
# Managed by modulesync - DO NOT EDIT
|
||||||
# https://github.com/voxpupuli/modulesync
|
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
|
||||||
# https://github.com/voxpupuli/modulesync_config
|
|
||||||
|
|
||||||
# puppetlabs_spec_helper will set up coverage if the env variable is set.
|
# puppetlabs_spec_helper will set up coverage if the env variable is set.
|
||||||
# We want to do this if lib exists and it hasn't been explicitly set.
|
# We want to do this if lib exists and it hasn't been explicitly set.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user