Skip to content

Commit

Permalink
Update branch references to main branch (#2524)
Browse files Browse the repository at this point in the history
  • Loading branch information
parlough authored Dec 4, 2024
1 parent 564bd1b commit 846608d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dart.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![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)
[![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)

## Packages

Expand Down
15 changes: 7 additions & 8 deletions dwds/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ alias flutter_tools='/YOUR_PATH/flutter/bin/dart /YOUR_PATH/flutter/packages/flu

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.

4. Choose a Flutter app to run (eg, the
[old](https://github.com/flutter/flutter/tree/master/dev/integration_tests/flutter_gallery)
or [new](https://github.com/flutter/gallery) Flutter Gallery apps).
4. Choose a Flutter app to run (such as the
[Flutter Gallery app](https://github.com/flutter/flutter/tree/master/dev/integration_tests/flutter_gallery).
1. From the Flutter app repo, run your local Flutter Tools with alias you
defined in step #2:

Expand Down Expand Up @@ -146,15 +145,15 @@ you need to:
Sometimes you might need to do a hotfix release of DWDS. An example of why this
might be necessary is if you need to do a hotfix of DWDS into Flutter, but don't
want to release a new version of DWDS with the current untested changes on the
master branch. Instead you only want to apply a fix to the current version of
`main` branch. Instead you only want to apply a fix to the current version of
DWDS in Flutter.

### Instructions:

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

a. In the GitHub UI's
[commit history view](https://github.com/dart-lang/webdev/commits/master),
[commit history view](https://github.com/dart-lang/webdev/commits/main),
find the commit that prepared the release of DWDS that you would like to
hotfix.

Expand All @@ -180,18 +179,18 @@ DWDS in Flutter.

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

1. Make the fix:

a. You can now make the change you would like to hotfix. From the GitHub UI,
open a PR to merge your change into the branch you created in step #3,
**not** `master`. See https://github.com/dart-lang/webdev/pull/1867 as an
**not** `main`. See https://github.com/dart-lang/webdev/pull/1867 as an
example.

1. Once it's merged, you can follow the instructions to
[publish DWDS to pub](#step-2-publish-dwds-to-pub), except instead of pulling
from `master`, pull from the branch your created in step #3.
from `main`, pull from the branch your created in step #3.

1. If necessary, open a cherry-pick request in Flutter to update the version.
See https://github.com/flutter/flutter/issues/118122 for an example.
2 changes: 1 addition & 1 deletion dwds/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 24.2.0-wip
description: >-
A service that proxies between the Chrome debug protocol and the Dart VM
service protocol.
repository: https://github.com/dart-lang/webdev/tree/master/dwds
repository: https://github.com/dart-lang/webdev/tree/main/dwds
environment:
sdk: ^3.4.0

Expand Down
2 changes: 1 addition & 1 deletion frontend_server_client/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 4.0.0
description: >-
Client code to start and interact with the frontend_server compiler from the
Dart SDK.
repository: https://github.com/dart-lang/webdev/tree/master/frontend_server_client
repository: https://github.com/dart-lang/webdev/tree/main/frontend_server_client

environment:
sdk: ^3.1.0
Expand Down
2 changes: 1 addition & 1 deletion tool/ci.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webdev/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 3.7.0-wip
description: >-
A CLI for Dart web development. Provides an easy and consistent set of
features for users and tools to build and deploy web applications with Dart.
repository: https://github.com/dart-lang/webdev/tree/master/webdev
repository: https://github.com/dart-lang/webdev/tree/main/webdev
environment:
sdk: ^3.2.0

Expand Down

0 comments on commit 846608d

Please sign in to comment.