From 280b3a9ee4f9233026b0806bf12da378f0d95ce5 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Thu, 26 Apr 2018 14:38:54 +0100
Subject: [PATCH] (MODULES-7023) - Removing duplication in sync.yml

---
 .sync.yml   | 25 ++-----------------------
 .travis.yml | 11 +++++++----
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 951d5e8..9a44c1c 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,30 +1,13 @@
 ---
-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:
     - set: docker/debian-8
-      options:
     - set: docker/ubuntu-14.04
-      options:
   docker_defaults:
     bundler_args: ""
   secure: ""
   branches:
     - release
-  extras:
-    - rvm: 2.1.9
-      script: "\"bundle exec rake release_checks\""
 
 Gemfile:
   required:
@@ -47,10 +30,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
+appveyor.yml:
+  delete: true
diff --git a/.travis.yml b/.travis.yml
index b70e449..bc1d2dc 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
-- 
2.32.3