From 30d2187b2861ab162e48a9d132dfd2879edb8300 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 23 Apr 2019 12:24:08 -0700 Subject: [PATCH 1/3] Update github templates and cutover to the Chef Foundation team This repo is part of the Chef Foundation project. This change updates notifications and codeowners. Signed-off-by: Tim Smith --- .expeditor/config.yml | 9 +++-- .github/CODEOWNERS | 4 +- .../BUG_TEMPLATE.md} | 10 ++++- .github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md | 40 +++++++++++++++++++ .../ENHANCEMENT_REQUEST_TEMPLATE.md | 17 ++++++++ .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md | 11 +++++ .github/PULL_REQUEST_TEMPLATE.md | 3 +- .github/lock.yml | 1 + .travis.yml | 9 +++-- CONTRIBUTING.md | 15 +------ 10 files changed, 95 insertions(+), 24 deletions(-) rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/BUG_TEMPLATE.md} (65%) create mode 100644 .github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md create mode 100644 .github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md create mode 100644 .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md create mode 100644 .github/lock.yml diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 9eed473e..b211f0f7 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -2,7 +2,7 @@ --- # Slack channel in Chef Software slack to send notifications about build failures, etc slack: - notify_channel: releng-notify + notify_channel: chef-found-notify # This publish is triggered by the `built_in:publish_rubygems` artifact_action. rubygems: @@ -15,7 +15,10 @@ github: version_tag_format: "v{{version}}" # allow bumping the minor release via label minor_bump_labels: - - "Expeditor: Bump Minor Version" + - "Expeditor: Bump Version Minor" + # allow bumping the major release via label + major_bump_labels: + - "Expeditor: Bump Version Major" changelog: rollup_header: Changes not yet released to rubygems.org @@ -30,7 +33,7 @@ merge_actions: only_if: built_in:bump_version - built_in:update_changelog: ignore_labels: - - "Expeditor: Exclude From Changelog" + - "Expeditor: Skip Changelog" - "Expeditor: Skip All" - built_in:build_gem: only_if: built_in:bump_version diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9c20a47c..f1217b32 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,5 @@ # Order is important. The last matching pattern has the most precedence. -* @chef/jex-team +* @chef/chef-foundation-reviewers +.expeditor/** @chef/jex-team +*.md @chef/docs-team diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md similarity index 65% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/BUG_TEMPLATE.md index f229e13f..f28915b7 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md @@ -1,8 +1,16 @@ +--- +name: � Bug Report +about: If something isn't working as expected �. +labels: "Status: Untriaged" +--- + # Version: [Version of the project installed] -# Environment: [Details about the environment such as the Operating System, cookbook details, etc...] +# Environment: + +[Details about the environment such as the Operating System, cookbook details, etc...] # Scenario: diff --git a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md new file mode 100644 index 00000000..9f4a958f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md @@ -0,0 +1,40 @@ +--- +name: Design Proposal +about: I have a significant change I would like to propose and discuss before starting +labels: "Status: Untriaged" +--- + +### When a Change Needs a Design Proposal + +A design proposal should be opened any time a change meets one of the following qualifications: + +- Significantly changes the user experience of a project in a way that impacts users. +- Significantly changes the underlying architecture of the project in a way that impacts other developers. +- Changes the development or testing process of the project such as a change of CI systems or test frameworks. + +### Why We Use This Process + +- Allows all interested parties (including any community member) to discuss large impact changes to a project. +- Serves as a durable paper trail for discussions regarding project architecture. +- Forces design discussions to occur before PRs are created. +- Reduces PR refactoring and rejected PRs. + +--- + + + +## Motivation + + + +## Specification + + + +## Downstream Impact + + diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md b/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..65bf5a06 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md @@ -0,0 +1,17 @@ +--- +name: 🚀 Enhancement Request +about: I have a suggestion (and may want to implement it 🙂)! +labels: "Status: Untriaged" +--- + +### Describe the Enhancement: + + +### Describe the Need: + + +### Current Alternative + + +### Can We Help You Implement This?: + diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md new file mode 100644 index 00000000..921a5f0b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md @@ -0,0 +1,11 @@ +--- +name: 🤗 Support Question +about: If you have a question 💬, please check out our Slack! +--- + +We use GitHub issues to track bugs and feature requests. If you need help please post to our Mailing List or join the Chef Community Slack. + + * Chef Community Slack at http://community-slack.chef.io/. + * Chef Mailing List https://discourse.chef.io/ + + Support issues opened here will be closed and redirected to Slack or Discourse. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 441965fc..0df03f84 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,10 +5,11 @@ ### Issues Resolved [List any existing issues this PR resolves, or any Discourse or -StackOverflow discussion that's relevant] +StackOverflow discussions that are relevant] ### Check List - [ ] New functionality includes tests - [ ] All tests pass - [ ] All commits have been signed-off for the Developer Certificate of Origin. See +- [ ] PR title is a worthy inclusion in the CHANGELOG \ No newline at end of file diff --git a/.github/lock.yml b/.github/lock.yml new file mode 100644 index 00000000..66d5d496 --- /dev/null +++ b/.github/lock.yml @@ -0,0 +1 @@ +daysUntilLock: 60 diff --git a/.travis.yml b/.travis.yml index 06ede171..71ce647f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ -sudo: false language: ruby cache: bundler +dist: xenial addons: apt: sources: - - chef-stable-trusty + - chef-stable-xenial packages: - chefdk - wget @@ -25,14 +25,15 @@ matrix: - rvm: 2.2.10 - rvm: 2.3.8 - rvm: 2.4.5 - - rvm: 2.5.3 + - rvm: 2.5.5 + - rvm: 2.6.2 - rvm: ruby-head allow_failures: - rvm: ruby-head branches: only: - - master + - master bundler_args: --without docs development diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55a65edc..03fdbfa7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,14 +1 @@ -This project is maintained by the contribution guidelines identified for - [chef](https://github.com/chef/chef) project. You can find the guidelines here: - -https://github.com/chef/chef/blob/master/CONTRIBUTING.md - -Pull requests in this project are merged when they have two :+1:s from maintainers. - -## Maintainers - - -- [Thom May](https://github.com/thommay) -- [Patrick Wright](https://github.com/patrick-wright) -- [Serdar Sutay](https://github.com/sersut) -- [Seth Chisamore](https://github.com/schisamo) +Please refer to https://github.com/chef/chef/blob/master/CONTRIBUTING.md From 456c616549e39ee32588bcfc2d1cecf73bd59e77 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 23 Apr 2019 12:30:36 -0700 Subject: [PATCH 2/3] Remove Ruby 1.9.3 testing RVM doesn't have 1.9.3 anymore so we can't do this. Signed-off-by: Tim Smith --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71ce647f..fd84efb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,6 @@ addons: matrix: include: - # WE SUPPORT UPGRADES OF CHEF 11.x on RUBY 1.9.3 VIA chef_client_updater COOKBOOK - - rvm: 1.9.3 - bundler_args: --without chefstyle functional development docs --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle} - script: - - bundle exec rake unit - - bundle exec rake functional - rvm: 2.0 - rvm: 2.1.10 - rvm: 2.2.10 From cb3cd9281d2daa8e1e340c72053c4914df238a7e Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 23 Apr 2019 12:44:37 -0700 Subject: [PATCH 3/3] Attempt to get Ruby 2.6 tests passing Signed-off-by: Tim Smith --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 09a9d1bd..6a50d90e 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,7 @@ group :test do gem "rake" gem "rspec" gem "vcr" - gem "webmock", "~> 2.3.2" # ruby 1.9.3 - gem "addressable", "~> 2.4.0" # ruby 1.9.3 + gem "webmock", "~> 3.4" gem "aruba", "~> 0.14" gem "cucumber", "~> 1.3.20" gem "climate_control"