-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #188 from simple-framework/issue_186
update to pdk 1.7.1
- Loading branch information
Showing
12 changed files
with
154 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
.git/ | ||
.*.sw[op] | ||
.metadata | ||
.yardoc | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,70 +1,41 @@ | ||
--- | ||
stages: | ||
- test_2.4.1 | ||
- test_2.1.9 | ||
- syntax | ||
- unit | ||
|
||
cache: | ||
paths: | ||
- vendor/bundle | ||
|
||
before_script: | ||
- bundle -v | ||
- rm Gemfile.lock || true | ||
- gem update --system | ||
- gem update bundler | ||
- gem --version | ||
- bundle -v | ||
- bundle install --without system_tests | ||
|
||
rubocop-2.4.1: | ||
stage: test_2.4.1 | ||
image: ruby:2.4.1 | ||
script: | ||
- bundle exec rake rubocop | ||
|
||
syntax-2.4.1: | ||
stage: test_2.4.1 | ||
image: ruby:2.4.1 | ||
script: | ||
- bundle exec rake syntax lint | ||
- bundle install --without system_tests --path vendor/bundle --jobs $(nproc) | ||
|
||
metadata-2.4.1: | ||
stage: test_2.4.1 | ||
image: ruby:2.4.1 | ||
script: | ||
- bundle exec rake metadata_lint | ||
|
||
rspec-puppet-2.4.1: | ||
stage: test_2.4.1 | ||
image: ruby:2.4.1 | ||
variables: | ||
PUPPET_GEM_VERSION: ~> 4.0 | ||
CHECK: spec | ||
script: | ||
- bundle update | ||
- bundle exec rake $CHECK | ||
|
||
rubocop-2.1.9: | ||
stage: test_2.1.9 | ||
parallel_spec-Ruby 2.1.9-Puppet ~> 4.0: | ||
stage: unit | ||
image: ruby:2.1.9 | ||
script: | ||
- bundle exec rake rubocop | ||
- bundle exec rake parallel_spec | ||
variables: | ||
PUPPET_GEM_VERSION: '~> 4.0' | ||
|
||
syntax-2.1.9: | ||
stage: test_2.1.9 | ||
image: ruby:2.1.9 | ||
syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.4.4-Puppet ~> 5.5: | ||
stage: syntax | ||
image: ruby:2.4.4 | ||
script: | ||
- bundle exec rake syntax lint | ||
- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop | ||
variables: | ||
PUPPET_GEM_VERSION: '~> 5.5' | ||
|
||
metadata-2.1.9: | ||
stage: test_2.1.9 | ||
image: ruby:2.1.9 | ||
parallel_spec-Ruby 2.4.4-Puppet ~> 5.5: | ||
stage: unit | ||
image: ruby:2.4.4 | ||
script: | ||
- bundle exec rake metadata_lint | ||
|
||
rspec-puppet-2.1.9: | ||
stage: test_2.1.9 | ||
image: ruby:2.1.9 | ||
- bundle exec rake parallel_spec | ||
variables: | ||
PUPPET_GEM_VERSION: ~> 4.0 | ||
CHECK: spec | ||
script: | ||
- bundle update | ||
- bundle exec rake $CHECK | ||
PUPPET_GEM_VERSION: '~> 5.5' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
.git/ | ||
.*.sw[op] | ||
.metadata | ||
.yardoc | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
--markup markdown | ||
--output-dir docs/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,75 @@ | ||
require 'puppetlabs_spec_helper/rake_tasks' | ||
require 'puppet-syntax/tasks/puppet-syntax' | ||
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? | ||
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any? | ||
|
||
def changelog_user | ||
return unless Rake.application.top_level_tasks.include? "changelog" | ||
returnVal = nil || JSON.load(File.read('metadata.json'))['author'] | ||
raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil? | ||
puts "GitHubChangelogGenerator user:#{returnVal}" | ||
returnVal | ||
end | ||
|
||
def changelog_project | ||
return unless Rake.application.top_level_tasks.include? "changelog" | ||
returnVal = nil || JSON.load(File.read('metadata.json'))['name'] | ||
raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil? | ||
puts "GitHubChangelogGenerator project:#{returnVal}" | ||
returnVal | ||
end | ||
|
||
def changelog_future_release | ||
return unless Rake.application.top_level_tasks.include? "changelog" | ||
returnVal = JSON.load(File.read('metadata.json'))['version'] | ||
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil? | ||
puts "GitHubChangelogGenerator future_release:#{returnVal}" | ||
returnVal | ||
end | ||
|
||
PuppetLint.configuration.send('disable_relative') | ||
|
||
if Bundler.rubygems.find_name('github_changelog_generator').any? | ||
GitHubChangelogGenerator::RakeTask.new :changelog do |config| | ||
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil? | ||
config.user = "#{changelog_user}" | ||
config.project = "#{changelog_project}" | ||
config.future_release = "#{changelog_future_release}" | ||
config.exclude_labels = ['maintenance'] | ||
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)." | ||
config.add_pr_wo_labels = true | ||
config.issues = false | ||
config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" | ||
config.configure_sections = { | ||
"Changed" => { | ||
"prefix" => "### Changed", | ||
"labels" => ["backwards-incompatible"], | ||
}, | ||
"Added" => { | ||
"prefix" => "### Added", | ||
"labels" => ["feature", "enhancement"], | ||
}, | ||
"Fixed" => { | ||
"prefix" => "### Fixed", | ||
"labels" => ["bugfix"], | ||
}, | ||
} | ||
end | ||
else | ||
desc 'Generate a Changelog from GitHub' | ||
task :changelog do | ||
raise <<EOM | ||
The changelog tasks depends on unreleased features of the github_changelog_generator gem. | ||
Please manually add it to your .sync.yml for now, and run `pdk update`: | ||
--- | ||
Gemfile: | ||
optional: | ||
':development': | ||
- gem: 'github_changelog_generator' | ||
git: 'https://github.com/skywinder/github-changelog-generator' | ||
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' | ||
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" | ||
EOM | ||
end | ||
end | ||
|
||
PuppetLint.configuration.send('relative') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters