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
The main thing I want to address here is that the major steps aren't really numbered. This is because they are written as headings (h3 and h4). I just hardcoded step numbers here.
Also fixed some indentation bugs, and list item bugs.
@@ -226,7 +227,7 @@ to add DevTools release notes to Flutter website and test them in DevTools.
226
227
[g/flutter-internal-announce](http://g/flutter-internal-announce) with a link to
227
228
the new release notes.
228
229
229
-
### Prepare DevTools for the next beta release
230
+
### 9) Prepare DevTools for the next beta release
230
231
231
232
**The `daily-dev-bump` workflow is currently broken: [#8558](https://github.com/flutter/devtools/issues/8558). Until it's fixed, manually update the DevTools version for the next release and open a PR with the changes:**
232
233
```shell
@@ -253,53 +254,53 @@ of the full release process.
253
254
254
255
## Cherry-pick releases
255
256
256
-
### Prepare the release in the `flutter/devtools` repo
257
+
### 1) Prepare the release in the `flutter/devtools` repo
257
258
258
259
1. Find the [DevTools tag](https://github.com/flutter/devtools/tags) that you want
259
-
to perform the cherry-pick release on top of.
260
+
to perform the cherry-pick release on top of.
260
261
261
262
For example, if you want to perform a cherry pick release of DevTools into
262
263
the Flutter / Dart beta branch, you can see what the current version of DevTools
### Create the merge commit in the `flutter/devtools` repo
385
+
### 5) Create the merge commit in the `flutter/devtools` repo
384
386
387
+
> [!IMPORTANT]
385
388
> **If your cherry-pick CL has not been approved and merged, wait.**
386
389
387
390
In order to ensure that the cherry-picked DevTools commit does not get GC'ed, we
388
391
need to perform a merge commit from the branch we just created (e.g. `2.29.1`)
389
392
onto the `flutter/devtools` protected branch (`master`).
390
393
391
394
1. Create a pull request in the GitHub UI from the cherry-pick branch to the
392
-
`master` branch.
393
-
- Navigate to `https://github.com/flutter/devtools/compare/<cherry-pick-branch>`,
394
-
where `<cherry-pick-branch>` is the branch you pushed up to the `upstream`
395
-
remote with the cherry-picked commit(s) (e.g. `2.29.1`).
396
-
- Click "Create pull request", and then create a PR with a descriptive title:
397
-
"Merge commit for cherry-pick release 2.29.1"
398
-
- Once created, you should see several merge conflicts at the bottom of the PR.
399
-
Click "Resolve conflicts" in the GitHub UI, and resolve any merge conflicts by
400
-
**accepting whatever is on master**. Once you do this, the PR should show changes
401
-
in **zero** lines of code.
402
-
- Ask a member of the DevTools team for review, but **DO NOT** squash and merge yet.
403
-
404
-
2. Message @kenzieschmoll directly with the following request. If you cannot message
405
-
@kenzieschmoll directly, create an [issue](https://github.com/flutter/devtools/issues/new)
406
-
and assign it to @kenzieschmoll.
395
+
`master` branch.
396
+
1. Navigate to `https://github.com/flutter/devtools/compare/<cherry-pick-branch>`,
397
+
where `<cherry-pick-branch>` is the branch you pushed up to the `upstream`
398
+
remote with the cherry-picked commit(s) (e.g. `2.29.1`).
399
+
2. Click "Create pull request", and then create a PR with a descriptive title:
400
+
"Merge commit for cherry-pick release 2.29.1"
401
+
3. Once created, you should see several merge conflicts at the bottom of the PR.
402
+
Click "Resolve conflicts"in the GitHub UI, and resolve any merge conflicts by
403
+
**accepting whatever is on master**. Once you do this, the PR should show changes
404
+
in**zero** lines of code.
405
+
4. Ask a member of the DevTools team for review, but **DO NOT** squash and merge yet.
406
+
407
+
2. Message @kenzieschmoll or @elliette directly with the following request. If you cannot
408
+
message @kenzieschmoll or @elliette directly, create an
409
+
[issue](https://github.com/flutter/devtools/issues/new) and assign it to
410
+
@kenzieschmoll or @elliette.
407
411
408
412
409
413
Title:
410
414
411
-
Create merge commit for flutter/devtools cherry-pick.
415
+
> Create merge commit for flutter/devtools cherry-pick.
412
416
413
417
Body:
414
418
415
-
1. Temporarily modify the settings of https://github.com/flutter/devtools to "allow merge
416
-
commits at the repo level and remove `require linear history`".
417
-
2. IMPORTANT: Merge <linktoPR> as a MERGE COMMIT. When merging, use the merge button dropdown menu to select "Create a merge commit", NOT "Squash and merge".
418
-
3. Revert the settings.
419
+
> 1\. Temporarily modify the settings of https://github.com/flutter/devtools to "allow merge
420
+
> commits at the repo level and remove `require linear history`".\
421
+
> 2\. IMPORTANT: Merge <link to PR> as a MERGE COMMIT. When merging, use the merge button dropdown
422
+
> menu to select"Create a merge commit", NOT "Squash and merge".\
423
+
> 3\. Revert the settings.
419
424
420
425
If @kenzieschmoll is unavailable to complete the merge commit, please ask another member of the Dash
421
426
team who has Admin access to the `flutter/devtools` repository settings (@piinks or @tvolkert).
0 commit comments