From e979f6e85be10dfe2a47792c0cefa5d09ad5e0a6 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 12 Jul 2019 09:16:22 -0700 Subject: [PATCH] doc: define non-trivial --- docs/RELEASE_ISSUE_TEMPLATE.md | 2 +- docs/releases.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/RELEASE_ISSUE_TEMPLATE.md b/docs/RELEASE_ISSUE_TEMPLATE.md index f3ff2dde1..9e3beb827 100644 --- a/docs/RELEASE_ISSUE_TEMPLATE.md +++ b/docs/RELEASE_ISSUE_TEMPLATE.md @@ -26,7 +26,7 @@ For each RC published in each stage: Checklist: - [ ] **Stage 1 - Internal Testing** - - [ ] Feature freeze. If any non-trivial features get added to the release, uncheck all the checkboxes and return to this stage. + - [ ] Feature freeze. If any "non-trivial" changes (see the footnotes of [docs/releases.md](https://github.com/ipfs/go-ipfs/tree/master/docs/releases.md) for a definition) get added to the release, uncheck all the checkboxes and return to this stage. - [ ] CHANGELOG.md has been updated - use `./bin/mkreleaselog` to generate a nice starter list - [ ] Automated Testing (already tested in CI) - Ensure that all tests are passing, this includes: diff --git a/docs/releases.md b/docs/releases.md index 48123a410..838d26df4 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -17,7 +17,7 @@ We might expand the six week release schedule in case of: ## Release Flow -`go-ipfs` releases come in 4 stages designed to gradually roll out changes and reduce the impact of any regressions that may have been introduced. If we need to merge non-trivial features/fixes during the process, we start over at stage 1. +`go-ipfs` releases come in 4 stages designed to gradually roll out changes and reduce the impact of any regressions that may have been introduced. If we need to merge non-trivial[2] changes during the process, we start over at stage 1. ### Stage 1 - Internal Testing @@ -68,3 +68,4 @@ We do not yet retroactively apply fixes to older releases (no Long Term Support ---------------------------- - **[1]** - _early testers_ is an IPFS programme in which members of the community can self-volunteer to help test `go-ipfs` Release Candidates. You find more info about it at [EARLY_TESTERS.md](./EARLY_TESTERS.md) +- **[2]** - A non-trivial change is any change that could potentially introduce an issue not trivially caught by automated testing. This is up to the discretion of the Lead Maintainer but the assumption is that every change is non-trivial unless proven otherwise.