Skip to content

Commit 846608d

Browse files
authored
Update branch references to main branch (#2524)
1 parent 564bd1b commit 846608d

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

.github/workflows/dart.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Dart](https://github.com/dart-lang/webdev/workflows/Dart%20CI/badge.svg)](https://github.com/dart-lang/webdev/actions?query=workflow%3A%22Dart+CI%22+branch%3Amaster)
1+
[![Dart](https://github.com/dart-lang/webdev/workflows/Dart%20CI/badge.svg)](https://github.com/dart-lang/webdev/actions?query=workflow%3A%22Dart+CI%22+branch%3Amain)
22

33
## Packages
44

dwds/CONTRIBUTING.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ alias flutter_tools='/YOUR_PATH/flutter/bin/dart /YOUR_PATH/flutter/packages/flu
3434

3535
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.
3636

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).
4039
1. From the Flutter app repo, run your local Flutter Tools with alias you
4140
defined in step #2:
4241

@@ -146,15 +145,15 @@ you need to:
146145
Sometimes you might need to do a hotfix release of DWDS. An example of why this
147146
might be necessary is if you need to do a hotfix of DWDS into Flutter, but don't
148147
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
150149
DWDS in Flutter.
151150

152151
### Instructions:
153152

154153
1. Create a branch off the release that needs a hotfix:
155154

156155
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),
158157
find the commit that prepared the release of DWDS that you would like to
159158
hotfix.
160159

@@ -180,18 +179,18 @@ DWDS in Flutter.
180179

181180
a. Make the appropriate changes to DWDS' `mono_pkg.yaml` then run
182181
`mono_repo generate`. Submit this change to the branch you created in step
183-
#3, **not** `master`.
182+
#3, **not** `main`.
184183

185184
1. Make the fix:
186185

187186
a. You can now make the change you would like to hotfix. From the GitHub UI,
188187
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
190189
example.
191190

192191
1. Once it's merged, you can follow the instructions to
193192
[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.
195194

196195
1. If necessary, open a cherry-pick request in Flutter to update the version.
197196
See https://github.com/flutter/flutter/issues/118122 for an example.

dwds/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 24.2.0-wip
44
description: >-
55
A service that proxies between the Chrome debug protocol and the Dart VM
66
service protocol.
7-
repository: https://github.com/dart-lang/webdev/tree/master/dwds
7+
repository: https://github.com/dart-lang/webdev/tree/main/dwds
88
environment:
99
sdk: ^3.4.0
1010

frontend_server_client/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 4.0.0
33
description: >-
44
Client code to start and interact with the frontend_server compiler from the
55
Dart SDK.
6-
repository: https://github.com/dart-lang/webdev/tree/master/frontend_server_client
6+
repository: https://github.com/dart-lang/webdev/tree/main/frontend_server_client
77

88
environment:
99
sdk: ^3.1.0

tool/ci.sh

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webdev/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: 3.7.0-wip
66
description: >-
77
A CLI for Dart web development. Provides an easy and consistent set of
88
features for users and tools to build and deploy web applications with Dart.
9-
repository: https://github.com/dart-lang/webdev/tree/master/webdev
9+
repository: https://github.com/dart-lang/webdev/tree/main/webdev
1010
environment:
1111
sdk: ^3.2.0
1212

0 commit comments

Comments
 (0)