Skip to content

Commit a6df83b

Browse files
authored
Update release instructions README.md (#5482)
* Update README.md Fix json url typo Clarify some points Add readthedocs instructions Rephrase Incorporate feedback Added Release model section
1 parent 68f5a3d commit a6df83b

File tree

1 file changed

+46
-14
lines changed

1 file changed

+46
-14
lines changed

package/README.md

+46-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# Release tools
22

3+
## Release model
4+
5+
The release model is linear. That means that there is only one main code branch, and releases are snapshots of that branch at specific points in the sequence of commits.
6+
The advantage of this model is that the maintenance effort is greately reduced compared to other release models, such as a branched model.
7+
The disadvantage is that progress is ever only forward, and fixes can't be backported to prior releases. this means there is no such thing as a "stable" release (however, see Sub releases below).
8+
9+
There are 4 types of releases:
10+
11+
*Major releases*
12+
13+
These contain breaking changes, such as big API changes, both in function signature and data representation. When this happens, user apps will require changes to continue to work, and those changes could be significant.
14+
Major releases happen seldom, e.g.: every few years.
15+
In addition, a Major can contain changes from Minor releases.
16+
17+
*Minor releases*
18+
19+
These contain new features and bug fixes. Breaking changes should not be included here. The one exception is breaking changes for a feature that is too broken and is not worth fixing, especially if that feature is causing maintenance overhead.
20+
Minor releases happen maybe 1-3 times per year.
21+
In addition, a Minor release can contain changes from Sub releases.
22+
23+
*Sub releases*
24+
25+
Sub releases are mostly meant for stabilization purposes. Once a Major or Minor release is out, it is possible that critical bugs or issues are found. Given that fixes can't be backported, a sub release is made that includes such critical bug fixes.
26+
Sub releases happen a few weeks after a Major or Minor release.
27+
28+
*Beta releases*
29+
30+
Depending on the number of changes that have been merged since the last release, and on how big and disruptive those changes are, a beta release could be done prior to a Major or Minor. Beta releases are meant to provide an outlook of what the upcoming release will look like, in order to allow users to do early testing and provide feedback. This helps in identifying big issues early on, thereby allowing time to fix them before the final Major or Minor release.
31+
Beta releases should not be done for Sub releases.
32+
333
## Overview
434

535
This directory contains scripts used to automate the release process of esp8266/Arduino project.
@@ -57,35 +87,37 @@ Here is an overview of the release process. See the section below for detailed i
5787

5888
* When done, put release notes into a private Gist and send the link to other maintainers for review.
5989

60-
* Update `version` to the release in platform.txt and commit. E.g. `2.5.0`.
90+
The following points assume work in a direct clone of the repository, and not in a personal fork.
91+
92+
2. Update `version` to the release in platform.txt and commit. E.g. `2.5.0`. Then git push origin to get the commit merged to master.
6193

62-
2. Tag the latest commit on the master branch. In this project, tags have form `X.Y.Z`, e.g. `2.4.0`, or `X.Y.Z-rcN` for release versions. Notice that there's no `v`at the beginning of the tag. Tags must be annotated, not lightweight tags. To create a tag, use git command (assuming that the master branch is checked out):
94+
3. Tag the latest commit on the master branch. In this project, tags have form `X.Y.Z`, e.g. `2.4.0`, or `X.Y.Z-betaN` for release candiate versions. Notice that there's no `v`at the beginning of the tag. Tags must be annotated, not lightweight tags. To create a tag, use git command (assuming that the master branch is checked out):
6395

6496
```
65-
git tag -a -m "Release 2.4.0" 2.4.0
97+
git tag -a -m "Release 2.5.0" 2.5.0
6698
```
6799

68-
3. Push the tag created in step 2 to esp8266/Arduino Github repository:
100+
4. Push the tag created in step 2 to esp8266/Arduino Github repository:
69101

70102
```
71-
git push origin 2.4.0
103+
git push origin 2.5.0
72104
```
73105

74-
4. Wait for Travis CI build for the tag to pass. Check that the new (draft) release has been created. Check that the boards manager package .zip file has been successfully uploaded as a release artifact.
106+
5. Wait for Travis CI build for the tag to pass. Check that the new (draft) release has been created. Check that the boards manager package .zip file has been successfully uploaded as a release artifact.
75107

76-
5. Check that the package index downloaded from http://arduino.esp8266.com/stable/package_esp8266_index.json contains an entry for the new version (it may not be the first one).
108+
6. Check that the package index downloaded from http://arduino.esp8266.com/stable/package_esp8266com_index.json contains an entry for the new version (it may not be the first one).
77109

78-
6. Navigate to release list in Github, press "Edit" button to edit release description, paste release notes. Remove "draft" status of the release and publish it.
110+
7. Navigate to release list in Github, press "Edit" button to edit release description, paste release notes, and publish it.
79111

80-
7. In the issue tracker, remove "staged-for-release" label for all issues which have it, and close them. Close the milestone associated with the released version.
112+
8. In the issue tracker, remove "staged-for-release" label for all issues which have it, and close them. Close the milestone associated with the released version.
81113

82-
8. Create a commit to the master branch, updating:
114+
9. Check that https://arduino-esp8266.readthedocs.io/en/latest/ has a new doc build for the new tag, and that "stable" points to that build. If a new build did not trigger, log into readthedoc's home and trigger it manually.
83115

84-
* The version in platform.txt file. This should correspond to the version of the *next* milestone, plus `-dev` suffix. E.g. `2.5.0-dev`.
85116

86-
* In main README.md:
117+
10. Create a commit to the master branch, updating:
87118

88-
- in "Contributing" section, update the "easy issues" link to point to the next milestone.
119+
* The version in platform.txt file. This should correspond to the version of the *next* milestone, plus `-dev` suffix. E.g. `2.5.0-dev`.
89120

90-
- in "Latest release" section, change version number in the readthedocs link to the version which was just released.
121+
* In main README.md:
91122

123+
- in "Latest release" section, change version number in the readthedocs link to the version which was just released, and verify that all links work.

0 commit comments

Comments
 (0)