From e1e6c9d874fc1769d3364090391047da8f905b2c Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 5 Apr 2019 17:16:14 -0700 Subject: [PATCH 1/2] Add additional github templates and update the expeditor config Auto assign the untriaged label on new issues Add additional issue templates including the design proposal template Add a codeowners file Add a lock bot config Remove default bits from the expeditor config and modernize the actions bit / label names Signed-off-by: Tim Smith --- .expeditor/config.yml | 34 ++++++++-------- .github/CODEOWNERS | 7 ++++ .../BUG_TEMPLATE.md} | 6 +++ .github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md | 40 +++++++++++++++++++ .../ENHANCEMENT_REQUEST_TEMPLATE.md | 17 ++++++++ .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md | 12 ++++++ .github/PULL_REQUEST_TEMPLATE.md | 5 ++- .github/lock.yml | 1 + 8 files changed, 104 insertions(+), 18 deletions(-) create mode 100644 .github/CODEOWNERS rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/BUG_TEMPLATE.md} (86%) 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 9b0bc74529..a7479da7b7 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -1,42 +1,44 @@ # 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-ws-notify +# This publish is triggered by the `built_in:publish_rubygems` artifact_action. +rubygems: + - chef-apply + github: - # The file where the MAJOR.MINOR.PATCH version is kept. The version in this file - # is bumped automatically via the `built_in:bump_version` merge_action. - version_file: "VERSION" - # The file where our CHANGELOG is kept. This file is updated automatically with - # details from the Pull Request via the `built_in:update_changelog` merge_action. - changelog_file: "CHANGELOG.md" - # Delete the PR branch after successfully merged into release branch. + # This deletes the GitHub PR branch after successfully merged into the release branch delete_branch_on_merge: true + # allow bumping the minor release via label + minor_bump_labels: + - "Expeditor: Bump Version Minor" + # allow bumping the major release via label + major_bump_labels: + - "Expeditor: Bump Version Major" -rubygems: - - chef-apply +changelog: + rollup_header: Changes not yet released to rubygems.org # 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 - built_in:update_changelog: ignore_labels: - - "Meta: Exclude From Changelog" - - "Expeditor: Exclude From Changelog" + - "Expeditor: Skip Changelog" - "Expeditor: Skip All" - built_in:build_gem: - only_if: - - built_in:bump_version + only_if: built_in:bump_version promote: - action: + actions: + - built_in:rollover_changelog - built_in:publish_rubygems subscriptions: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000000..ee05bc2612 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,7 @@ +# Order is important. The last matching pattern has the most precedence. + +* @chef/client-workstation +.expeditor/** @chef/jex-team +README.md @chef/docs-team +RELEASE_NOTES.md @chef/docs-team +.github/ISSUE_TEMPLATE/** @chef/docs-team diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md similarity index 86% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/BUG_TEMPLATE.md index f1c74f49eb..359fc6ce5c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md @@ -1,3 +1,9 @@ +--- +name: � Bug Report +about: If something isn't working as expected �. +labels: "Status: Untriaged" +--- + ## Description diff --git a/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md b/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md new file mode 100644 index 0000000000..9f4a958fea --- /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 0000000000..65bf5a06b1 --- /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 0000000000..68c5664792 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md @@ -0,0 +1,12 @@ +--- +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 ed46981aff..d450bc8ce3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,11 +5,12 @@ ### 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 -- [ ] You have locally validated the change +- [ ] You have locally validated the change \ No newline at end of file diff --git a/.github/lock.yml b/.github/lock.yml new file mode 100644 index 0000000000..66d5d4962c --- /dev/null +++ b/.github/lock.yml @@ -0,0 +1 @@ +daysUntilLock: 60 From 3f119e1ba4fd031fa8403f61736d7eb3ef6baba4 Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Thu, 16 May 2019 10:12:44 -0600 Subject: [PATCH 2/2] Fixing Expeditor CHANGELOG-002 error Signed-off-by: tyler-ball --- CHANGELOG.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c4ae81606..8029f1a5c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,17 @@ -+ + + ## [0.2.12](https://github.com/chef/chef-apply/tree/0.2.12) (2019-05-16) #### Merged Pull Requests - Adding license acceptance passthrough logic [#81](https://github.com/chef/chef-apply/pull/81) ([tyler-ball](https://github.com/tyler-ball)) + + + + + + ## [0.2.11](https://github.com/chef/chef-apply/tree/0.2.11) (2019-02-20) #### Merged Pull Requests @@ -212,4 +219,4 @@ - [SHACK-304] Expeditor should build chef-apply as a gem [#5](https://github.com/chef/chef-apply/pull/5) ([tyler-ball](https://github.com/tyler-ball)) - [SHACK-250] Renaming the chef-run gem to chef-apply [#1](https://github.com/chef/chef-apply/pull/1) ([tyler-ball](https://github.com/tyler-ball)) -+ \ No newline at end of file ++