@@ -34,9 +34,8 @@ alias flutter_tools='/YOUR_PATH/flutter/bin/dart /YOUR_PATH/flutter/packages/flu
34
34
35
35
Note: This is even easier if you create a ` pubspec_overrides.yaml ` file in the ` flutter_tools ` directory, and then git-ignore it. This way you don't have to worry about committing your DWDS override.
36
36
37
- 4 . Choose a Flutter app to run (eg, the
38
- [ old] ( https://github.com/flutter/flutter/tree/master/dev/integration_tests/flutter_gallery )
39
- or [ new] ( https://github.com/flutter/gallery ) Flutter Gallery apps).
37
+ 4 . Choose a Flutter app to run (such as the
38
+ [ Flutter Gallery app] ( https://github.com/flutter/flutter/tree/master/dev/integration_tests/flutter_gallery ) .
40
39
1 . From the Flutter app repo, run your local Flutter Tools with alias you
41
40
defined in step #2 :
42
41
@@ -146,15 +145,15 @@ you need to:
146
145
Sometimes you might need to do a hotfix release of DWDS. An example of why this
147
146
might be necessary is if you need to do a hotfix of DWDS into Flutter, but don't
148
147
want to release a new version of DWDS with the current untested changes on the
149
- master branch. Instead you only want to apply a fix to the current version of
148
+ ` main ` branch. Instead you only want to apply a fix to the current version of
150
149
DWDS in Flutter.
151
150
152
151
### Instructions:
153
152
154
153
1 . Create a branch off the release that needs a hotfix:
155
154
156
155
a. In the GitHub UI's
157
- [ commit history view] ( https://github.com/dart-lang/webdev/commits/master ) ,
156
+ [ commit history view] ( https://github.com/dart-lang/webdev/commits/main ) ,
158
157
find the commit that prepared the release of DWDS that you would like to
159
158
hotfix.
160
159
@@ -180,18 +179,18 @@ DWDS in Flutter.
180
179
181
180
a. Make the appropriate changes to DWDS' ` mono_pkg.yaml ` then run
182
181
` mono_repo generate ` . Submit this change to the branch you created in step
183
- #3 , ** not** ` master ` .
182
+ #3 , ** not** ` main ` .
184
183
185
184
1 . Make the fix:
186
185
187
186
a. You can now make the change you would like to hotfix. From the GitHub UI,
188
187
open a PR to merge your change into the branch you created in step #3 ,
189
- ** not** ` master ` . See https://github.com/dart-lang/webdev/pull/1867 as an
188
+ ** not** ` main ` . See https://github.com/dart-lang/webdev/pull/1867 as an
190
189
example.
191
190
192
191
1 . Once it's merged, you can follow the instructions to
193
192
[ publish DWDS to pub] ( #step-2-publish-dwds-to-pub ) , except instead of pulling
194
- from ` master ` , pull from the branch your created in step #3 .
193
+ from ` main ` , pull from the branch your created in step #3 .
195
194
196
195
1 . If necessary, open a cherry-pick request in Flutter to update the version.
197
196
See https://github.com/flutter/flutter/issues/118122 for an example.
0 commit comments