Skip to content

Commit 7868871

Browse files
authored
Update out-of-date RELEASE instructions (#9505)
1 parent 3ecaa34 commit 7868871

File tree

1 file changed

+37
-14
lines changed

1 file changed

+37
-14
lines changed

tool/RELEASE_INSTRUCTIONS.md

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,27 @@ Receive an LGTM for the PR, squash and commit.
160160

161161
### 5) Wait for the binary to be uploaded CIPD
162162

163-
On each DevTools commit, DevTools is built and uploaded to CIPD. You can check the
164-
status of the builds on this
163+
On each DevTools commit, DevTools is built and uploaded to CIPD. You can check
164+
the status of the builds on this
165165
[dashboard](https://ci.chromium.org/ui/p/dart-internal/builders/flutter/devtools).
166-
Within minutes, a build should be uploaded for the commit you just merged and tagged.
166+
Within minutes, a build should be uploaded for the commit you just merged and
167+
tagged.
167168

168-
> [!NOTE]
169-
> If the CIPD build times out, instructions for re-triggering can be found at
170-
[go/dart-engprod/release.md](http://go/dart-engprod/release.md)
169+
If you don't see a build, you can check the following yourself or ask a Googler
170+
to check them for you:
171+
172+
1. Check the source mirror:
173+
[go/flutter-devtools-sourcemirror](http://go/flutter-devtools-sourcemirror).
174+
The CIPD build can only begin once the commit is reflected in the source
175+
mirror.
176+
2. If you see the commit in the source mirror, but the the CIPD build times out,
177+
instructions for re-triggering can be found at
178+
[go/devtools-dart-engprod#cherry-picks](http://go/devtools-dart-engprod#cherry-picks).
179+
**Note: Use `refs/heads/master` as the branch.**
171180
172181
### 6) Update the DevTools hash in the Dart SDK
173182
174-
Run the tool script with the commit hash you just merged and tagged:
183+
Run the tool script with the commit hash you just merged:
175184
```shell
176185
dt update-sdk-deps -c <commit-hash>
177186
```
@@ -184,15 +193,20 @@ Quickly test the build and then add a reviewer:
184193
```shell
185194
cd $LOCAL_DART_SDK && \
186195
gclient sync -D && \
187-
./tools/build.py -mrelease -ax64 create_sdk;
196+
./tools/build.py -mrelease create_sdk;
188197
```
189198
190199
2. Verify that running `dart devtools` launches the version of DevTools you just released.
191-
- for OSX
200+
- for Macs with ARM-based processors (M chips):
201+
```shell
202+
xcodebuild/ReleaseARM64/dart-sdk/bin/dart devtools
203+
```
204+
- for Macs with x64-based processors (Intel chips):
192205
```shell
193206
xcodebuild/ReleaseX64/dart-sdk/bin/dart devtools
194207
```
195-
- For non-OSX
208+
209+
- For non-Macs:
196210
```shell
197211
out/ReleaseX64/dart-sdk/bin/dart devtools
198212
```
@@ -416,13 +430,22 @@ onto the `flutter/devtools` protected branch (`master`).
416430

417431
Body:
418432

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`".\
433+
> 1\. Temporarily modify the settings of https://github.com/flutter/devtools to allow merge
434+
> commits at the repo level and remove require linear history for the master branch:
435+
>
436+
> 1a. General > Pull Requests > Allow merge commits (Add all commits from the head branch
437+
> to the base branch with a merge commit).
438+
>
439+
> 1b. Branches > Branch protection rules > click “edit” on the master branch > Remove >
440+
> Require linear history (Prevent merge commits from being pushed to matching branches),
441+
> and then “Save changes”.
442+
>
421443
> 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".\
444+
> menu to select "Create a merge commit", NOT "Squash and merge".
445+
>
423446
> 3\. Revert the settings.
424447
425-
If @kenzieschmoll is unavailable to complete the merge commit, please ask another member of the Dash
448+
If @kenzieschmoll or @elliette is unavailable to complete the merge commit, please ask another member of the Dash
426449
team who has Admin access to the `flutter/devtools` repository settings (@piinks or @tvolkert).
427450
428451
### Additional resources

0 commit comments

Comments
 (0)