You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
1. Checkout `edge` and make a chore release branch, without any new changes. The branch name should match `chore_release-*`.
@@ -79,17 +80,17 @@ only use annotated tags
79
80
git tag -a v${alphaVersion} -m 'chore(release): ${alphaVersion}'
80
81
```
81
82
82
-
5. Review the tag with `git show v${alphaVersion}`. Double check that the commit displayed is the one you want - it should probably be the latest commit in your release branch, and you should double check that with the Github web UI. If the tag looks good, push it - this starts the build process. This is a release candidate that will undergo QA.
83
+
4. Review the tag with `git show v${alphaVersion}`. Double check that the commit displayed is the one you want - it should probably be the latest commit in your release branch, and you should double check that with the Github web UI. If the tag looks good, push it - this starts the build process. This is a release candidate that will undergo QA.
83
84
84
85
```shell
85
86
git push origin v${alphaVersion}
86
87
```
87
88
88
89
Changelogs for the release are automatically generated when the tag is pushed and sent to the release page in github.
89
90
90
-
6. Run QA on this release. If issues are found, create PRs targeted on the release branch. To create new alpha releases, repeat steps 4-6.
91
+
5. Run QA on this release. If issues are found, create PRs targeted on the release branch. To create new alpha releases, repeat steps 4-6.
91
92
92
-
7. Once QA is a pass, do a final check that the release notes are good and wordsmithed, and then do a NORMAL MERGE into `release`. Do NOT squash or rebase; do NOT yet push a tag. This should be done from your local command line (and will succeed as long as the release PR is reviewed and status checks have passed):
93
+
6. Once QA is a pass, do a final check that the release notes are good and wordsmithed, and then do a NORMAL MERGE into `release`. Do NOT squash or rebase; do NOT yet push a tag. This should be done from your local command line (and will succeed as long as the release PR is reviewed and status checks have passed):
93
94
94
95
```shell
95
96
# note: make sure you have pulled the latest changes for branch
@@ -103,7 +104,7 @@ only use annotated tags
103
104
git push origin release
104
105
```
105
106
106
-
8. Make a tag for the release. This tag will have the actual target release version, no alpha prerelease tags involved. It should be the same as the `${version}` part of your release branch:
107
+
7. Make a tag for the release. This tag will have the actual target release version, no alpha prerelease tags involved. It should be the same as the `${version}` part of your release branch:
107
108
108
109
```shell
109
110
git tag -a v${version} -m 'chore(release): ${version}'
@@ -120,24 +121,24 @@ only use annotated tags
120
121
121
122
The tag push will kick off release builds and deploy the results to customers. It will also create a release page where those builds and automatically generated in-depth changelogs will be posted.
122
123
123
-
9. Ensure all deploy jobs succeeded:
124
+
8. Ensure all deploy jobs succeeded:
124
125
125
126
- The Opentrons App should be prompting people to update to the new version.
126
127
-https://pypi.org/project/opentrons/ should be showing the new version.
127
128
128
-
10. Release the Python Protocol API docs for this version (see below under Releasing Web Projects).
129
+
9. Release the Python Protocol API docs for this version (see below under Releasing Web Projects).
129
130
130
-
11. Update the download links on https://opentrons.com/ot-app/. That page is defined in an Opentrons private repository.
131
+
10. Update the download links on https://opentrons.com/ot-app/. That page is defined in an Opentrons private repository.
131
132
132
-
12. Open a PR of `release` into `edge`. Give the PR a name like `chore(release): Merge changes from ${version} into edge`. Once it passes, on the command line merge it into `edge`:
133
+
11. Open a PR of `release` into `edge`. Give the PR a name like `chore(release): Merge changes from ${version} into edge`. Once it passes, on the command line merge it into `edge`:
133
134
134
135
```shell
135
136
git checkout edge
136
137
git pull
137
138
git merge --no-ff release
138
139
```
139
140
140
-
13. Use the PR title for the merge commit title. You can then`git push origin edge`, which will succeed as long as the PR is approved and status checks pass.
141
+
12. Use the PR title for the merge commit title. You can then`git push origin edge`, which will succeed as long as the PR is approved and status checks pass.
0 commit comments