diff --git a/.sync.yml b/.sync.yml index 648965d5b..dec732498 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,15 +1,4 @@ --- -appveyor.yml: - environment: - PUPPET_GEM_VERSION: "~> 4.0" - matrix: - - RUBY_VERSION: 24-x64 - CHECK: "syntax lint" - - RUBY_VERSION: 24-x64 - CHECK: metadata_lint - - RUBY_VERSION: 24-x64 - CHECK: rubocop - .travis.yml: bundle_args: --without system_tests docker_sets: @@ -22,9 +11,6 @@ appveyor.yml: secure: "" branches: - release - extras: - - rvm: 2.1.9 - script: "\"bundle exec rake release_checks\"" Gemfile: required: @@ -47,14 +33,6 @@ Gemfile: from_env: BEAKER_HOSTGENERATOR_VERSION - gem: beaker-rspec from_env: BEAKER_RSPEC_VERSION - ':development': - - gem: puppet-blacksmith - version: '~> 3.4' -Rakefile: - requires: - - puppet_blacksmith/rake_tasks - -spec/spec_helper.rb: - spec_overrides: - - "require 'spec_helper_local'" +appveyor.yml: + delete: true diff --git a/.travis.yml b/.travis.yml index 1597cfb05..14288376f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ language: ruby cache: bundler before_install: - bundle -v - - rm Gemfile.lock || true + - rm -f Gemfile.lock - gem update --system + - gem update bundler - gem --version - bundle -v script: @@ -14,9 +15,7 @@ script: bundler_args: --without system_tests rvm: - 2.4.1 - - 2.1.9 env: - - PUPPET_GEM_VERSION="~> 4.0" CHECK=spec - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec matrix: fast_finish: true @@ -44,8 +43,12 @@ matrix: - env: CHECK=metadata_lint - + env: CHECK=release_checks + - + env: CHECK=spec + - + env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec rvm: 2.1.9 - script: "bundle exec rake release_checks" branches: only: - master