Merge pull request #305 from puppetlabs/pdksync_1.7.0-0-g57412ed
pdksync - Update using 1.7.0
This commit is contained in:
@@ -45,9 +45,9 @@ matrix:
|
|||||||
rvm: 2.1.9
|
rvm: 2.1.9
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- /^v\d/
|
- /^v\d/
|
||||||
- release
|
- release
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
deploy:
|
deploy:
|
||||||
|
|||||||
4
Gemfile
4
Gemfile
@@ -36,8 +36,8 @@ group :development do
|
|||||||
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')
|
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')
|
||||||
end
|
end
|
||||||
group :system_tests do
|
group :system_tests do
|
||||||
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
|
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
|
||||||
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||||
end
|
end
|
||||||
|
|
||||||
puppet_version = ENV['PUPPET_GEM_VERSION']
|
puppet_version = ENV['PUPPET_GEM_VERSION']
|
||||||
|
|||||||
@@ -88,6 +88,6 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"template-url": "https://github.com/puppetlabs/pdk-templates",
|
"template-url": "https://github.com/puppetlabs/pdk-templates",
|
||||||
"template-ref": "1.6.1-0-g6b0d497",
|
"template-ref": "1.7.0-0-g57412ed",
|
||||||
"pdk-version": "1.6.1"
|
"pdk-version": "1.7.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
require 'puppetlabs_spec_helper/module_spec_helper'
|
require 'puppetlabs_spec_helper/module_spec_helper'
|
||||||
require 'rspec-puppet-facts'
|
require 'rspec-puppet-facts'
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user