From 1a4e52c63712854ca82d0d3cf07cdb03512b1708 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 23 Dec 2019 01:19:55 +0100 Subject: [PATCH] modulesync 2.10.0 --- .msync.yml | 2 +- .rubocop.yml | 2 +- .travis.yml | 4 ++-- Gemfile | 2 +- Rakefile | 10 ---------- .../nodesets/windows-2008R2-serverstandard-x64.yml | 14 -------------- 6 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 spec/acceptance/nodesets/windows-2008R2-serverstandard-x64.yml diff --git a/.msync.yml b/.msync.yml index a7c0bbf..11aed5f 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '2.9.0' +modulesync_config_version: '2.10.0' diff --git a/.rubocop.yml b/.rubocop.yml index 099a11c..5984ccc 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ require: rubocop-rspec AllCops: - TargetRubyVersion: 1.9 + TargetRubyVersion: 2.1 Include: - ./**/*.rb Exclude: diff --git a/.travis.yml b/.travis.yml index c821f99..204346d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ dist: bionic language: ruby cache: bundler before_install: - - gem update --system - - gem update bundler + - yes | gem update --system - bundle --version script: - 'bundle exec rake $CHECK' @@ -29,6 +28,7 @@ branches: - /^v\d/ notifications: email: false + webhooks: https://voxpupu.li/incoming/travis irc: on_success: always on_failure: always diff --git a/Gemfile b/Gemfile index 5a2e737..50a9030 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ group :test do gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-variable_contains_upcase', :require => false - gem 'puppet-lint-absolute_classname-check', :require => false + gem 'puppet-lint-absolute_classname-check', '>= 2.0.0', :require => false gem 'puppet-lint-topscope-variable-check', :require => false gem 'puppet-lint-legacy_facts-check', :require => false gem 'puppet-lint-anchor-check', :require => false diff --git a/Rakefile b/Rakefile index e3642ac..c0f2d37 100644 --- a/Rakefile +++ b/Rakefile @@ -8,16 +8,6 @@ rescue LoadError end PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}' -PuppetLint.configuration.absolute_classname_reverse = true - -exclude_paths = %w( - pkg/**/* - vendor/**/* - .vendor/**/* - spec/**/* -) -PuppetLint.configuration.ignore_paths = exclude_paths -PuppetSyntax.exclude_paths = exclude_paths desc 'Auto-correct puppet-lint offenses' task 'lint:auto_correct' do diff --git a/spec/acceptance/nodesets/windows-2008R2-serverstandard-x64.yml b/spec/acceptance/nodesets/windows-2008R2-serverstandard-x64.yml deleted file mode 100644 index 18f7b6e..0000000 --- a/spec/acceptance/nodesets/windows-2008R2-serverstandard-x64.yml +++ /dev/null @@ -1,14 +0,0 @@ -HOSTS: - win-2008R2-std: - roles: - - default - - agent - platform: windows-server-amd64 - box: opentable/win-2008r2-standard-amd64-nocm - hypervisor: vagrant - user: vagrant - ip: '10.255.33.129' - communicator: bitvise -CONFIG: - log_level: verbose - type: git