Skip to content

Conversation

elliette
Copy link
Contributor

@elliette elliette commented Jan 9, 2023

Follow-up to #1867

@elliette elliette requested a review from annagrin January 9, 2023 19:33
Copy link
Contributor

@annagrin annagrin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Elliott, I left some comments

[commit history view](https://github.com/dart-lang/webdev/commits/master),
find the commit that prepared the release of DWDS that you would like to
hotfix.
1. Click on `< >` ("Browse the repository at this point in history").
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a side affect of running the autoformatter - it still gets rendered as a numeric sequence (1, 2, 3, etc)

`git branch -a | grep 16.0.2-hotfix-release`
1. Track that branch with `git checkout --track branch_name` (e.g.
`remotes/upstream/16.0.2-hotfix-release`)
1. You can now make the change you would like to hotfix on the branch you have.
Copy link
Contributor

@annagrin annagrin Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add instructions on how to modify the CI for the hotfix branch before adding the actual fix (remove testing on irrelevant sdk versions, add testing on relevant sdk versions if needed, remove sending notifications, etc)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

[commit history view](https://github.com/dart-lang/webdev/commits/master),
find the commit that prepared the release of DWDS that you would like to
hotfix.
1. Click on `< >` ("Browse the repository at this point in history").
Copy link
Contributor

@annagrin annagrin Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add general description of the steps, so it is clear what are we trying to do? The steps above could move under the general step as sub-steps (so the user can chose to do them differently if needed, for example, via git commands)

For example

  1. create a branch off the release that needs a hotfix
    a. In the Github UI's
    commit history view,
    find the commit that prepared the release of DWDS that you would like to
    hotfix.
    b. Click on < > ("Browse the repository at this point in history").
    ...
  2. Update CI for the new branch
    a ...
  3. Add the fix
    a.
  4. publish
    a.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

`git checkout --track branch_name` (e.g.
`remotes/upstream/16.0.2-hotfix-release`)

1. Update the CI tests so that the branch tests against the appropriate Dart
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. ?

Copy link
Contributor

@annagrin annagrin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with small change request - the sequential numbering is still showing all 1's, can we update it to 1, 2, 3...?

@elliette
Copy link
Contributor Author

LGTM with small change request - the sequential numbering is still showing all 1's, can we update it to 1, 2, 3...?

This is a change made by the Markdown auto-formatter. You can create a sequentially ordered list using all 1s. That way MD automatically handles the numbering.

@elliette elliette merged commit 2e2587a into dart-lang:master Jan 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants