diff options
| -rw-r--r-- | .expeditor/config.yml | 26 | ||||
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Rakefile | 5 | ||||
| -rw-r--r-- | chef-zero.gemspec | 6 |
5 files changed, 36 insertions, 28 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 6c03df3..03f8478 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -1,33 +1,39 @@ +# Documentation available at https://expeditor.chef.io/docs/getting-started/ --- +# Slack channel in Chef Software slack to send notifications about build failures, etc slack: notify_channel: chef-notify +# This publish is triggered by the `built_in:publish_rubygems` artifact_action. +rubygems: + - chef-zero + github: + # This deletes the GitHub PR branch after successfully merged into the release branch + delete_branch_on_merge: true + # The tag format to use (e.g. v1.0.0) version_tag_format: "v{{version}}" + # allow bumping the minor release via label minor_bump_labels: - - "Version: Bump Minor" + - "Expeditor: Bump Minor Version" changelog: rollup_header: Changes not yet released to rubygems.org -rubygems: - - chef-zero - +# These actions are taken, in order they are specified, anytime a Pull Request is merged. merge_actions: - built_in:bump_version: ignore_labels: - - "Version: Skip Bump" + - "Expeditor: Skip Version Bump" - "Expeditor: Skip All" - bash:.expeditor/update_version.sh: - only_if: - - built_in:bump_version + only_if: built_in:bump_version - built_in:update_changelog: ignore_labels: - - "Changelog: Skip Update" + - "Expeditor: Exclude From Changelog" - "Expeditor: Skip All" - built_in:build_gem: - only_if: - - built_in:bump_version + only_if: built_in:bump_version promote: actions: diff --git a/.travis.yml b/.travis.yml index faecf1d..fdbe34a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: sudo: false language: ruby cache: bundler +bundler_args: --jobs 7 --without debug script: - bundle update @@ -18,25 +19,25 @@ script: matrix: include: - - rvm: 2.5.0 + - rvm: 2.5.3 env: PEDANT_KNIFE_TESTS=true PEDANT_ALLOW_RVM=1 - - rvm: 2.5.0 + - rvm: 2.5.3 env: SINGLE_ORG=true - - rvm: 2.5.0 + - rvm: 2.5.3 env: - CHEF_FS=true - - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" - - rvm: 2.5.0 + - "GEMFILE_MOD=\"gem 'ohai', github: 'chef/ohai'; gem 'chef', github: 'chef/chef'\"" + - rvm: 2.5.3 env: FILE_STORE=true - - rvm: 2.5.0 + - rvm: 2.5.3 script: bundle exec rake chef_spec env: TEST=chef_spec - - rvm: 2.5.0 + - rvm: 2.5.3 script: bundle exec rake spec env: TEST=rake_spec - - rvm: 2.4.3 + - rvm: 2.4.5 script: bundle exec rake spec env: TEST=rake_spec - - rvm: 2.5.0 + - rvm: 2.5.3 script: bundle exec rake style env: TEST=chefstyle @@ -1,4 +1,5 @@ source "https://rubygems.org" + gemspec # gem 'rest-client', :git => 'https://github.com/chef/rest-client.git' @@ -16,6 +17,13 @@ if ENV["GEMFILE_MOD"] instance_eval(ENV["GEMFILE_MOD"]) else gem "chef", "~> 14.0" + gem "ohai", "~> 14.0" +end + +group :debug do + gem "pry" + gem "pry-byebug" + gem "pry-stack_explorer" end # If you want to load debugging tools into the bundle exec sandbox, @@ -1,8 +1,5 @@ -require "bundler" require "bundler/gem_tasks" -require "chef_zero/version" - def run_oc_pedant(env = {}) ENV.update(env) require File.expand_path("spec/run_oc_pedant") @@ -59,5 +56,5 @@ begin task.options += ["--display-cop-names", "--no-color"] end rescue LoadError - puts "chefstyle/rubocop is not available. gem install chefstyle to do style checking." + puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed." end diff --git a/chef-zero.gemspec b/chef-zero.gemspec index 8e6771f..e05c6f6 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -4,13 +4,12 @@ require "chef_zero/version" Gem::Specification.new do |s| s.name = "chef-zero" s.version = ChefZero::VERSION - s.platform = Gem::Platform::RUBY s.summary = "Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes" s.description = s.summary s.author = "John Keiser" s.email = "jkeiser@chef.io" s.homepage = "http://www.chef.io" - s.license = "Apache 2.0" + s.license = "Apache-2.0" s.required_ruby_version = ">= 2.4.0" @@ -20,9 +19,6 @@ Gem::Specification.new do |s| s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "rack", "~> 2.0" - s.add_development_dependency "pry" - s.add_development_dependency "pry-byebug" - s.add_development_dependency "pry-stack_explorer" s.add_development_dependency "rake" s.add_development_dependency "rspec" |