diff --git a/.msync.yml b/.msync.yml index ef6eb4393..0a4a57db7 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '1.0.0' +modulesync_config_version: '1.1.0' diff --git a/.travis.yml b/.travis.yml index 415ddcddc..b16380d2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,19 +15,19 @@ script: matrix: fast_finish: true include: - - rvm: 2.1.9 + - rvm: 2.4.1 bundler_args: --without development dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker services: docker sudo: required - - rvm: 2.1.9 + - rvm: 2.4.1 bundler_args: --without development dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker services: docker sudo: required - - rvm: 2.4.1 + - rvm: 2.1.9 bundler_args: --without system_tests development env: PUPPET_VERSION="~> 4.0" CHECK=test - rvm: 2.4.1 diff --git a/Gemfile b/Gemfile index d127bee8a..9d5df205e 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,6 @@ group :test do gem 'rspec-puppet', '~> 2.5', :require => false gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-utils', :require => false - gem 'puppet-lint-absolute_classname-check', :require => false gem 'puppet-lint-leading_zero-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false diff --git a/Rakefile b/Rakefile index 5396cbb19..ab9411ba2 100644 --- a/Rakefile +++ b/Rakefile @@ -35,9 +35,9 @@ begin require 'github_changelog_generator/task' GitHubChangelogGenerator::RakeTask.new :changelog do |config| version = (Blacksmith::Modulefile.new).version - config.future_release = "v#{version}" - config.header = "# Change log\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 impact the functionality of the module." - config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync} + config.future_release = "v#{version}" if 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.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog} config.user = 'voxpupuli' end rescue LoadError