From 1bfe4da05ac4e3816b41a7e2a7a613fb2469b617 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 16 Dec 2019 20:14:40 +0000
Subject: [PATCH 1/2] (maint) update travis to not use bundle update --system

---
 .travis.yml   | 4 +++-
 metadata.json | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc6e320..8cfd3bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@ cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
-  - gem update --system $RUBYGEMS_VERSION
+  - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
+  - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
+  - '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
diff --git a/metadata.json b/metadata.json
index a92779f..9dde18f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,6 +81,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g643529a",
-  "pdk-version": "1.14.1"
+  "template-ref": "heads/master-0-gcaed9d7",
+  "pdk-version": "1.15.0"
 }

From 2b641fd530e020ef5e1d3c0f88713d657244447f Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 16 Dec 2019 20:57:22 +0000
Subject: [PATCH 2/2] (maint) update travis to notify puppet slack

---
 .sync.yml   | 3 +++
 .travis.yml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 5d1f4ac..9fa053e 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -60,6 +60,9 @@
     sudo: required
     stage: acceptance
   simplecov: true
+  notifications:
+    slack:
+      secure: Wf7Wz3KC0G9ngPiDcOIpSqcCfdvwKQqZdNH/z3GMcj/OipMAdyFSAVnBvikIl7L1c0LMU9ATEpub+jYzViT7RZywaNyer6SRAfs6MIgAYo4xxF/mOnDHAxXeUYAsBXXL4sS3NX2XWMPa9ZWUeuUQKth8O4STWgAX298QZLyYx5k=
 appveyor.yml:
   delete: true
 Gemfile:
diff --git a/.travis.yml b/.travis.yml
index 8cfd3bd..d145c70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,3 +78,5 @@ branches:
     - release
 notifications:
   email: false
+  slack:
+    secure: Wf7Wz3KC0G9ngPiDcOIpSqcCfdvwKQqZdNH/z3GMcj/OipMAdyFSAVnBvikIl7L1c0LMU9ATEpub+jYzViT7RZywaNyer6SRAfs6MIgAYo4xxF/mOnDHAxXeUYAsBXXL4sS3NX2XWMPa9ZWUeuUQKth8O4STWgAX298QZLyYx5k=