Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit 0.14.1 release notes to separate multiple PRs with "," instead of "/" #733

Merged
merged 2 commits into from
Jan 14, 2021

Conversation

harding
Copy link
Contributor

@harding harding commented Jan 13, 2021

As mentioned today in #bitcoin-core-dev IRC, the release notes for 0.21.0 will include at least one reference to a PR that was merged in the new GUI repository. laanwj said he'll put this in the notes as "gui/#nnnn", so this PR updates the plugin to handle that appropriately.

To eliminate conflicts, one historic release note is updated to change from using / as a separator between PRs to using , as the separator. The comma is consistent with other release notes, such as that for 0.14.0.

This change should be forward compatible for other possible monotree repos as long as they're part of the bitcoin-core organization and the release notes use the format <repo-name>/#<pr-number>, e.g. wallet/#123.

@harding
Copy link
Contributor Author

harding commented Jan 13, 2021

Tested:

  • Compiled the current master (this PR's merge root) and this branch, then diff'd the output HTML of the two sites to confirm there were identical except for the expected s/\//,/ change.

  • Made a fake reference to a GUI PR:

2021-01-13-06_58_51_926436358

@laanwj
Copy link
Member

laanwj commented Jan 13, 2021

Code review ACK 98b565a

To eliminate conflicts, one historic release note is updated to change from using / as a separator between PRs to using , as the separator. The comma is consistent with other release notes, such as that for 0.14.0.

Good catch. A good thing that separating with , is what we've mostly done.

@laanwj laanwj merged commit 9c9ba18 into bitcoin-core:master Jan 14, 2021
laanwj added a commit that referenced this pull request Jan 15, 2021
2ca4ef2 Plugins: fix monotree repo ref from gui/#123 to gui#123 (David A. Harding)

Pull request description:

  There was a slight miscommunication about the expected format in #733, this uses the format from #734 as tested on the actual release notes:

  ![2021-01-14-05_34_49_583462950](https://user-images.githubusercontent.com/61096/104612399-3f90c700-562a-11eb-82a3-3de2af4ac4de.png)

  I also quickly checked the HTML diff from before and after this change and I only saw one unwanted change (a link to an issue was dropped).  I think that's acceptable to keep the pattern simple.

  ![2021-01-14-05_28_39_838430961](https://user-images.githubusercontent.com/61096/104612600-7961cd80-562a-11eb-8fa0-839eba950f62.png)

ACKs for top commit:
  laanwj:
    ACK 2ca4ef2

Tree-SHA512: 4e312ac92904f0abab70ca0fa5d45586bff686746162d25ae9ce0653f732e9e0964ea435a9a0f7a4fa40de4ee4372a7cb9c37f8e53a55d978333636bf89373fe
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