(PDK-810) test against puppet#master branch

puppetlabs · Mar 26, 2018 · 211f481 · 211f481
1 parent f868f9d
commit 211f481
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -40,6 +40,8 @@ matrix:
       env: PUPPET_GEM_VERSION='~> 4.8.0'
     - rvm: 2.1.9
       env: PUPPET_GEM_VERSION='~> 4.7.0'
+    - rvm: 2.4.3
+      env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git'
 notifications:
   hipchat:
     rooms:

diff --git a/Gemfile b/Gemfile
@@ -30,7 +30,7 @@ end
 # `git://somewhere.git#branch`. You can also use a file source location, which
 # is specified as `file://some/location/on/disk`.
 def location_for(place_or_version, fake_version = nil)
-  if place_or_version =~ /^(git[:@][^#]*)#(.*)/
+  if place_or_version =~ /^((git|https)[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place_or_version =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]