Skip to content

Commit 797758e

Browse files
authored
Merge pull request puppetlabs#1017 from puppetlabs/pdksync_1.7.0-0-g57412ed
pdksync - Update using 1.7.0
2 parents 91edfdb + 7613e08 commit 797758e

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ matrix:
4545
rvm: 2.1.9
4646
branches:
4747
only:
48-
- master
49-
- /^v\d/
50-
- release
48+
- master
49+
- /^v\d/
50+
- release
5151
notifications:
5252
email: false
5353
deploy:

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ group :development do
3636
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3737
end
3838
group :system_tests do
39-
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
40-
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
39+
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
40+
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
4141
end
4242

4343
puppet_version = ENV['PUPPET_GEM_VERSION']

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"version_requirement": ">= 4.7.0 < 6.0.0"
8383
}
8484
],
85-
"pdk-version": "1.5.0",
85+
"pdk-version": "1.7.0",
8686
"template-url": "https://github.com/puppetlabs/pdk-templates",
87-
"template-ref": "heads/master-0-g0657063"
87+
"template-ref": "1.7.0-0-g57412ed"
8888
}

spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
require 'puppetlabs_spec_helper/module_spec_helper'
32
require 'rspec-puppet-facts'
43

0 commit comments

Comments
 (0)