(maint) update travis to not use bundle update --system

diff --git a/.travis.yml b/.travis.yml
index 1fc720dc5c261c52b0f20466550ed0c69486c6d3..5a62adcbb0261b2993cb73d780d3fd5e9293be63 100644 (file)
--- 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 95361fcf832777cb1c79610e34577f5d7aa3f85d..f9c1e5f17e1bd33753b1d84629b066095ae93c69 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -42,6 +42,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"
 }