From 0b6d476896c092417dd11daaf66f33a7d8254b31 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 15 Nov 2018 11:25:00 -0800 Subject: Update expeditor for standard labels Use our standard config Signed-off-by: Tim Smith --- .expeditor/config.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 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: -- cgit v1.2.1 From bcfc0e046f6f284584e4772ab7f42a540037f9b0 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 15 Nov 2018 11:25:14 -0800 Subject: Run tests on the latest Ruby releases Signed-off-by: Tim Smith --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index faecf1d..6cd4478 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,25 +18,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 + - 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 -- cgit v1.2.1 From dd72cf898377d4bf1356f9ce82db626c717a35dd Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 15 Nov 2018 11:26:01 -0800 Subject: Fix the gem license string and remove 'platform' value Use a SPDX standard license and remove the unnecessary platform field. Signed-off-by: Tim Smith --- chef-zero.gemspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chef-zero.gemspec b/chef-zero.gemspec index 8e6771f..6ae6fbe 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" -- cgit v1.2.1 From c4e01b2a9cdfac71de90a5a26a488c2750bf301b Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 15 Nov 2018 11:26:53 -0800 Subject: Cleanup gemfile and Rakefile Add the debug group we use elsewhere Remove requires in Rakefile we don't need Don't install pry and friends in travis to speed things up Signed-off-by: Tim Smith --- .travis.yml | 1 + Gemfile | 7 +++++++ Rakefile | 5 +---- chef-zero.gemspec | 3 --- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cd4478..9ae51eb 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 diff --git a/Gemfile b/Gemfile index a086282..afc8b3a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source "https://rubygems.org" + gemspec # gem 'rest-client', :git => 'https://github.com/chef/rest-client.git' @@ -18,6 +19,12 @@ else gem "chef", "~> 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, # add these additional dependencies into Gemfile.local eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local") diff --git a/Rakefile b/Rakefile index 048e97a..5e7f57b 100644 --- a/Rakefile +++ b/Rakefile @@ -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 6ae6fbe..e05c6f6 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -19,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" -- cgit v1.2.1 From 6c43eb739df6e17b9b89543f49cc6340e1e3e0fb Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 15 Nov 2018 11:36:35 -0800 Subject: Specify the versions of ohai we want to install as well Signed-off-by: Tim Smith --- .travis.yml | 2 +- Gemfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ae51eb..fdbe34a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ matrix: - rvm: 2.5.3 env: - CHEF_FS=true - - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" + - "GEMFILE_MOD=\"gem 'ohai', github: 'chef/ohai'; gem 'chef', github: 'chef/chef'\"" - rvm: 2.5.3 env: FILE_STORE=true - rvm: 2.5.3 diff --git a/Gemfile b/Gemfile index afc8b3a..1f63641 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ if ENV["GEMFILE_MOD"] instance_eval(ENV["GEMFILE_MOD"]) else gem "chef", "~> 14.0" + gem "ohai", "~> 14.0" end group :debug do -- cgit v1.2.1