1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406
|
<!-- These docs are updated and synced from https://github.com/conda/infra -->
<!-- (TODO: the first three links here should be updated with the `repo.url` syntax once it works!) -->
[epic template]: https://github.com/conda/conda/issues/new?assignees=&labels=epic&template=epic.yml
[compare]: https://github.com/conda/infrastructure/compare
[new release]: https://github.com/conda/infrastructure/releases/new
<!-- links -->
[infrastructure]: https://github.com/conda/infrastructure
[rever docs]: https://regro.github.io/rever-docs
[release docs]: https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
[merge conflicts]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts
[Anaconda Recipes]: https://github.com/AnacondaRecipes/conda-feedstock
[conda-forge]: https://github.com/conda-forge/conda-feedstock
# Release Process
> **Note:**
> Throughout this document are references to the version number as `YY.M.[$patch_number]`, this should be replaced with the correct version number. Do **not** prefix the version with a lowercase `v`.
## 1. Open the release issue and cut a release branch. (do this ~1 week prior to release)
> **Note:**
> The new release branch should adhere to the naming convention of `YY.M.x` (make sure to put the `.x` at the end!). In the case of patch/hotfix releases, however, do NOT cut a new release branch; instead, use the previously-cut release branch with the appropriate `YY.M.x` version numbers.
Use the issue template below to create the release issue. After creating the release issue, pin it for easy access.
<details>
<summary><code>GitHub Issue Template</code></summary>
```markdown
### Summary
Placeholder for `{{ repo.name }} YY.M.x` release.
| Pilot | <pilot> |
|---|---|
| Co-pilot | <copilot> |
### Tasks
[milestone]: {{ repo.url }}/milestone/<milestone>
[process]: {{ repo.url }}/blob/main/RELEASE.md
[releases]: {{ repo.url }}/releases
[main]: https://github.com/AnacondaRecipes/{{ repo.name }}-feedstock
[conda-forge]: https://github.com/conda-forge/{{ repo.name }}-feedstock
[ReadTheDocs]: https://readthedocs.com/projects/continuumio-{{ repo.name }}/
#### The week before release week
- [ ] Create release branch (named `YY.M.x`)
- [ ] Ensure release candidates are being successfully built (see `conda-canary/label/rc-{{ repo.name }}-YY.M.x`)
- [ ] [Complete outstanding PRs][milestone]
- [ ] Test release candidates
<!-- indicate here who has signed off on testing -->
#### Release week
- [ ] Create release PR (see [release process][process])
- [ ] [Publish release][releases]
- [ ] Activate the `YY.M.x` branch on [ReadTheDocs][ReadTheDocs]
- [ ] Feedstocks
- [ ] Bump version & update dependencies/tests in [Anaconda, Inc.'s feedstock][main]
- [ ] Bump version & update dependencies/tests in [conda-forge feedstock][conda-forge]
<!-- link any other feedstock PRs here -->
- [ ] Hand off to the Anaconda packaging team
- [ ] Announce release
- Blog Post (optional)
- [ ] conda.org (link to pull request)
- Long form
- [ ] Create release [announcement draft](https://github.com/conda/communications)
- [ ] [Discourse](https://conda.discourse.group/)
- [ ] [Matrix (conda/conda)](https://matrix.to/#/#conda_conda:gitter.im) (this auto posts from Discourse)
- Summary
- [ ] [Twitter](https://twitter.com/condaproject)
```
</details>
> **Note:**
> The [epic template][epic template] is perfect for this; remember to remove the **`epic`** label.
## 2. Alert various parties of the upcoming release. (do this ~1 week prior to release)
Let various interested parties know about the upcoming release; at minimum, conda-forge maintainers should be informed. For major features, a blog post describing the new features should be prepared and posted once the release is completed (see the announcements section of the release issue).
## 3. Ensure `rever.xsh` and `news/TEMPLATE` are up to date.
These are synced from [`conda/infrastructure`][infrastructure].
<details>
<summary><h2>4. Run rever. (ideally done on the Monday of release week)</h2></summary>
Currently, there are only 2 activities we use rever for, (1) aggregating the authors and (2) updating the changelog. Aggregating the authors can be an error-prone process and also suffers from builtin race conditions (_i.e._, to generate an updated `.authors.yml` we need an updated `.mailmap` but to have an updated `.mailmap` we need an updated `.authors.yml`). This is why the following steps are very heavy-handed (and potentially repetitive) in running rever commands, undoing commits, squashing/reordering commits, etc.
1. Install [`rever`][rever docs] and activate the environment:
```bash
$ conda create -n rever conda-forge::rever
$ conda activate rever
(rever) $
```
2. Clone and `cd` into the repository if you haven't done so already:
```bash
(rever) $ git clone git@github.com:{{ repo.user }}/{{ repo.name }}.git
(rever) $ cd conda
```
2. Fetch the latest changes from the remote and checkout the release branch created a week ago:
```bash
(rever) $ git fetch upstream
(rever) $ git checkout YY.M.x
```
2. Create a versioned branch, this is where rever will make its changes:
```bash
(rever) $ git checkout -b changelog-YY.M.[$patch_number]
```
2. Run `rever --activities authors`:
> **Note:**
> Include `--force` when re-running any rever commands for the same `<VERSION>`, otherwise, rever will skip the activity and no changes will be made (i.e., rever remembers if an activity has been run for a given version).
```bash
(rever) $ rever --activities authors --force <VERSION>
```
- If rever finds that any of the authors are not correctly represented in `.authors.yml` it will produce an error. If the author that the error pertains to is:
- **a new contributor**: the snippet suggested by rever should be added to the `.authors.yml` file.
- **an existing contributor**, a result of using a new name/email combo: find the existing author in `.authors.yml` and add the new name/email combo to that author's `aliases` and `alterative_emails`.
- Once you have successfully run `rever --activities authors` with no errors, review the commit made by rever. This commit will contain updates to one or more of the author files (`.authors.yml`, `.mailmap`, and `AUTHORS.md`). Due to the race condition between `.authors.yml` and `.mailmap`, we want to extract changes made to any of the following keys in `.authors.yml` and commit them separately from the other changes in the rever commit:
- `name`
- `email`
- `github`
- `aliases`
- `alternate_emails`
Other keys (e.g., `num_commits` and `first_commit`) do not need to be included in this separate commit as they will be overwritten by rever.
- Here's a sample run where we undo the commit made by rever in order to commit the changes to `.authors.yml` separately:
```bash
(rever) $ rever --activities authors --force YY.M.[$patch_number]
# changes were made to .authors.yml as per the prior bullet
(rever) $ git diff --name-only HEAD HEAD~1
.authors.yml
.mailmap
AUTHORS.md
# undo commit
(rever) $ git reset --soft HEAD~1
# undo changes made to everything except .authors.yml
(rever) $ git restore --staged --worktree .mailmap AUTHORS.md
```
- Commit these changes to `.authors.yml`:
```bash
(rever) $ git add .
(rever) $ git commit -m "Update .authors.yml"
```
- Rerun `rever --activities authors` and finally check that your `.mailmap` is correct by running:
```bash
git shortlog -se
```
Compare this list with `AUTHORS.md`. If they have any discrepancies, additional modifications to `.authors.yml` is needed, so repeat the above steps as needed.
- Once you are pleased with how the author's file looks, we want to undo the rever commit and commit the `.mailmap` changes separately:
```bash
# undo commit (but preserve changes)
(rever) $ git reset --soft HEAD~1
# undo changes made to everything except .mailmap
(rever) $ git restore --staged --worktree .authors.yml AUTHORS.md
```
- Commit these changes to `.mailmap`:
```bash
(rever) $ git add .
(rever) $ git commit -m "Update .mailmap"
```
- Continue repeating the above processes until the `.authors.yml` and `.mailmap` are corrected to your liking. After completing this, you will have at most two commits on your release branch:
```bash
(rever) $ git cherry -v main
+ 86957814cf235879498ed7806029b8ff5f400034 Update .authors.yml
+ 3ec7491f2f58494a62f1491987d66f499f8113ad Update .mailmap
```
4. Review news snippets (ensure they are all using the correct Markdown format, **not** reStructuredText) and add additional snippets for undocumented PRs/changes as necessary.
> **Note:**
> We've found it useful to name news snippets with the following format: `<PR #>-<DESCRIPTIVE SLUG>`.
>
> We've also found that we like to include the PR #s inline with the text itself, e.g.:
>
> ```markdown
> ## Enhancements
>
> * Add `win-arm64` as a known platform (subdir). (#11778)
> ```
- You can utilize [GitHub's compare view][compare] to review what changes are to be included in this release.
- Add a new news snippet for any PRs of importance that are missing.
- Commit these changes to news snippets:
```bash
(rever) $ git add .
(rever) $ git commit -m "Update news"
```
- After completing this, you will have at most three commits on your release branch:
```bash
(rever) $ git cherry -v main
+ 86957814cf235879498ed7806029b8ff5f400034 Update .authors.yml
+ 3ec7491f2f58494a62f1491987d66f499f8113ad Update .mailmap
+ 432a9e1b41a3dec8f95a7556632f9a93fdf029fd Update news
```
5. Run `rever --activities changelog`:
> **Note:**
> This has previously been a notoriously fickle step (likely due to incorrect regex patterns in the `rever.xsh` config file and missing `github` keys in `.authors.yml`) so beware of potential hiccups. If this fails, it's highly likely to be an innocent issue.
```bash
(rever) $ rever --activities changelog --force <VERSION>
```
- Any necessary modifications to `.authors.yml`, `.mailmap`, or the news snippets themselves should be amended to the previous commits.
- Once you have successfully run `rever --activities changelog` with no errors simply revert the last commit (see the next step for why):
```bash
# undo commit (and discard changes)
(rever) $ git reset --hard HEAD~1
```
- After completing this, you will have at most three commits on your release branch:
```bash
(rever) $ git cherry -v main
+ 86957814cf235879498ed7806029b8ff5f400034 Update .authors.yml
+ 3ec7491f2f58494a62f1491987d66f499f8113ad Update .mailmap
+ 432a9e1b41a3dec8f95a7556632f9a93fdf029fd Update news
```
6. Now that we have successfully run the activities separately, we wish to run both together. This will ensure that the contributor list, a side-effect of the authors activity, is included in the changelog activity.
```bash
(rever) $ rever --force <VERSION>
```
- After completing this, you will have at most five commits on your release branch:
```bash
(rever) $ git cherry -v main
+ 86957814cf235879498ed7806029b8ff5f400034 Update .authors.yml
+ 3ec7491f2f58494a62f1491987d66f499f8113ad Update .mailmap
+ 432a9e1b41a3dec8f95a7556632f9a93fdf029fd Update news
+ a5c0db938893d2c12cab12a1f7eb3e646ed80373 Update authorship for YY.M.[$patch_number]
+ 5e95169d0df4bcdc2da9a6ba4a2561d90e49f75d Update CHANGELOG for YY.M.[$patch_number]
```
7. Since rever does not include stats on first-time contributors, we will need to add this manually.
- Use [GitHub's auto-generated release notes][new release] to get a list of all new contributors (and their first PR) and manually merge this list with the contributor list in `CHANGELOG.md`. See [GitHub docs][release docs] for how to auto-generate the release notes.
- Commit these final changes:
```bash
(rever) $ git add .
(rever) $ git commit -m "Add first-time contributions"
```
- After completing this, you will have at most six commits on your release branch:
```bash
(rever) $ git cherry -v main
+ 86957814cf235879498ed7806029b8ff5f400034 Update .authors.yml
+ 3ec7491f2f58494a62f1491987d66f499f8113ad Update .mailmap
+ 432a9e1b41a3dec8f95a7556632f9a93fdf029fd Update news
+ a5c0db938893d2c12cab12a1f7eb3e646ed80373 Update authorship for YY.M.[$patch_number]
+ 5e95169d0df4bcdc2da9a6ba4a2561d90e49f75d Update CHANGELOG for YY.M.[$patch_number]
+ 93fdf029fd4cf235872c12cab12a1f7e8f95a755 Add first-time contributions
```
8. Push this versioned branch.
```bash
(rever) $ git push -u upstream changelog-YY.M.[$patch_number]
```
9. Open the Release PR targing the `YY.M.x` branch.
<details>
<summary>GitHub PR Template</summary>
```markdown
## Description
✂️ snip snip ✂️ the making of a new release.
Xref #<RELEASE ISSUE>
```
</details>
10. Update release issue to include a link to the release PR.
11. [Create][new release] the release and **SAVE AS A DRAFT** with the following values:
> **Note:**
> Only publish the release after the release PR is merged, until then always **save as draft**.
| Field | Value |
|---|---|
| Choose a tag | `YY.M.[$patch_number]` |
| Target | `YY.M.x` |
| Body | copy/paste blurb from `CHANGELOG.md` |
</details>
## 5. Wait for review and approval of release PR.
## 6. Manually test canary build(s).
### Canary Builds for Manual Testing
Once the release PRs are filed, successful canary builds will be available on `https://anaconda.org/conda-canary/conda/files?channel=rc-{{ repo.name }}-YY.M.x` for manual testing.
> **Note:**
> You do not need to apply the `build::review` label for release PRs; every commit to the release branch builds and uploads canary builds to the respective `rc-` label.
## 7. Merge release PR and publish release.
To publish the release, go to the project's release page (e.g., https://github.com/conda/conda/releases) and add the release notes from `CHANGELOG.md` to the draft release you created earlier. Then publish the release.
> **Note:**
> Release notes can be drafted and saved ahead of time.
## 8. Merge/cherry pick the release branch over to the `main` branch.
<details>
<summary>Internal process</summary>
1. From the main "< > Code" page of the repository, select the drop down menu next to the `main` branch button and then select "View all branches" at the very bottom.
2. Find the applicable `YY.M.x` branch and click the "New pull request" button.
3. "Base" should point to `main` while "Compare" should point to `YY.M.x`.
4. Ensure that all of the commits being pulled in look accurate, then select "Create pull request".
> **Note:**
> Make sure NOT to push the "Update Branch" button. If there are [merge conflicts][merge conflicts], create a temporary "connector branch" dedicated to fixing merge conflicts separately from the `YY.M.x` and `main` branches.
5. Review and merge the pull request the same as any code change pull request.
> **Note:**
> The commits from the release branch need to be retained in order to be able to compare individual commits; in other words, a "merge commit" is required when merging the resulting pull request vs. a "squash merge". Protected branches will require permissions to be temporarily relaxed in order to enable this action.
</details>
## 9. Open PRs to bump [Anaconda Recipes][Anaconda Recipes] and [conda-forge][conda-forge] feedstocks to use `YY.M.[$patch_number]`.
> **Note:**
> Conda-forge's PRs will be auto-created via the `regro-cf-autotick-bot`. Follow the instructions below if any changes need to be made to the recipe that were not automatically added (these instructions are only necessary for anyone who is _not_ a conda-forge feedstock maintainer, since maintainers can push changes directly to the autotick branch):
> - Create a new branch based off of autotick's branch (autotick's branches usually use the `regro-cf-autotick-bot:XX.YY.[$patch_number]_[short hash]` syntax)
> - Add any changes via commits to that new branch
> - Open a new PR and push it against the `main` branch
>
> Make sure to include a comment on the original `autotick-bot` PR that a new pull request has been created, in order to avoid duplicating work! `regro-cf-autotick-bot` will close the auto-created PR once the new PR is merged.
>
> For more information about this process, please read the ["Pushing to regro-cf-autotick-bot branch" section of the conda-forge documentation](https://conda-forge.org/docs/maintainer/updating_pkgs.html#pushing-to-regro-cf-autotick-bot-branch).
## 10. Hand off to Anaconda's packaging team.
<details>
<summary>Internal process</summary>
1. Open packaging request in #package_requests Slack channel, include links to the Release PR and feedstock PRs.
2. Message packaging team/PM to let them know that a release has occurred and that you are the release manager.
</details>
## 11. Continue championing and shepherding.
Remember to make all relevant announcements and continue to update the release issue with the latest details as tasks are completed.
|