From 697e61803119a06cc481419db1f27963181e9caa Mon Sep 17 00:00:00 2001 From: octavianlarion Date: Tue, 5 Feb 2019 11:31:58 +0200 Subject: (maint) pdksync_1.9.0-0-g7281db5 This is required to keep in line with our module release process. --- .puppet-lint.rc | 1 + .sync.yml | 6 ++++++ .travis.yml | 6 ------ Gemfile | 1 + metadata.json | 8 ++++---- spec/spec_helper.rb | 3 +++ 6 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 .puppet-lint.rc diff --git a/.puppet-lint.rc b/.puppet-lint.rc new file mode 100644 index 0000000..cc96ece --- /dev/null +++ b/.puppet-lint.rc @@ -0,0 +1 @@ +--relative diff --git a/.sync.yml b/.sync.yml index 61ba852..68670b6 100644 --- a/.sync.yml +++ b/.sync.yml @@ -30,6 +30,12 @@ Gemfile: - gem: beaker-puppet from_env: BEAKER_PUPPET_VERSION version: '~> 0.14' + optional: + ':development': + - gem: 'github_changelog_generator' + git: 'https://github.com/skywinder/github-changelog-generator' + ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' + condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" .gitlab-ci.yml: delete: true diff --git a/.travis.yml b/.travis.yml index fdb8668..521510d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,6 @@ dist: trusty language: ruby cache: bundler before_install: - - if [ $BUNDLER_VERSION ]; then - gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri; - fi - bundle -v - rm -f Gemfile.lock - gem update --system $RUBYGEMS_VERSION @@ -29,9 +26,6 @@ matrix: - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec rvm: 2.4.4 - - - env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3 - rvm: 2.1.9 branches: only: - master diff --git a/Gemfile b/Gemfile index 674b5b9..81d8791 100644 --- a/Gemfile +++ b/Gemfile @@ -27,6 +27,7 @@ group :development do gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby] gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') end group :system_tests do gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] diff --git a/metadata.json b/metadata.json index 712401b..1c8666d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,7 +1,7 @@ { "name": "puppetlabs-cron_core", "version": "1.0.0", - "author": "Puppet Labs", + "author": "puppetlabs", "summary": "Install and manage cron resources.", "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-cron_core", @@ -78,7 +78,7 @@ "version_requirement": ">= 6.0.0 < 7.0.0" } ], - "pdk-version": "1.8.0", - "template-url": "https://github.com/puppetlabs/pdk-templates.git", - "template-ref": "heads/master-0-ge116657" + "pdk-version": "1.9.0", + "template-url": "https://github.com/puppetlabs/pdk-templates/", + "template-ref": "1.9.0-0-g7281db5" } \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 35654b3..0d5efc0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -32,6 +32,9 @@ RSpec.configure do |c| # by default Puppet runs at warning level Puppet.settings[:strict] = :warning end + c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT'] + c.after(:suite) do + end end def ensure_module_defined(module_name) -- cgit v1.2.3