Skip to content

chore(cdk-release): support separate alpha Changelog#16182

Merged
mergify[bot] merged 8 commits intomasterfrom
njlynch/alpha-changelogs
Aug 31, 2021
Merged

chore(cdk-release): support separate alpha Changelog#16182
mergify[bot] merged 8 commits intomasterfrom
njlynch/alpha-changelogs

Conversation

@njlynch
Copy link
Copy Markdown
Contributor

@njlynch njlynch commented Aug 23, 2021

This is part of the continued work to release the experimental modules as
independent alpha modules. This change introduces a new mode for handling
changes in the changelog: in this new mode, all changes from alpha modules are still
stripped from the main changelog (as they are currently for v2); those alpha module
changes are now also written to a dedicated changelog (e.g., CHANGELOG.v2.alpha.md).

related #15591


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

This is part of the continued work to release the experimental modules as
independent alpha modules. This change introduces a new mode for handling
changes in the changelog: in this new mode, all experimental features are still
stripped from the main changelog (as they are currently for v2), but individual
changelogs are also created for each experimental package to show the changes
specific to those packages.

I _believe_ the final behavior should be that the experimental changes are also
included in the main changelog, under a new heading, but decided to save that
for the next rev, as there's still some ambiguity about the best customer
experience, and what's most feasible given conventional-changelog.

related #15591
@njlynch njlynch requested a review from a team August 23, 2021 14:07
@njlynch njlynch self-assigned this Aug 23, 2021
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Aug 23, 2021

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 23, 2021
Copy link
Copy Markdown
Contributor

@skinny85 skinny85 left a comment

Choose a reason for hiding this comment

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

Looks great @njlynch! Some minor comments/questions.

@njlynch njlynch requested review from a team and skinny85 August 25, 2021 10:28
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 25, 2021

Sorry but I didn't understand the command. Please consult the commands documentation 📚.

Hey, I reacted but my real name is @Mergifyio

1 similar comment
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 25, 2021

Sorry but I didn't understand the command. Please consult the commands documentation 📚.

Hey, I reacted but my real name is @Mergifyio

Copy link
Copy Markdown
Contributor

@skinny85 skinny85 left a comment

Choose a reason for hiding this comment

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

Looks great overall. I still think we shouldn't put the Changelog for the experimental modules inside the V1 module directory. If you feel really strongly on this topic, feel free to get a second opinion from someone else on the team, and if they also say the experimental Changelog should be in the V1 package directory, I'll acquiesce.

@njlynch njlynch changed the title chore(cdk-release): support independent experimental changelogs chore(cdk-release): support separate alpha Changelog Aug 27, 2021
@njlynch njlynch requested review from a team and skinny85 August 27, 2021 11:30
Copy link
Copy Markdown
Contributor

@skinny85 skinny85 left a comment

Choose a reason for hiding this comment

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

One question about CHANGELOG.alpha.md.

@skinny85
Copy link
Copy Markdown
Contributor

@njlynch here's an idea: how about, instead of generating a separate alpha Changelog, you generate one Changelog for V2, but in the format that you proposed in the RFC, so looking like:

# [v2.1.0]
---
## aws-cdk-lib

### Features
* **bar:** new fizzbuzz support ([#999999](https://github.com/aws/aws-cdk/issues/999999)) (b01dface), closes [#999998](https://github.com/aws/aws-cdk/issues/999998)
* **foo:** more buzzing on the fizzes  ([#999994](https://github.com/aws/aws-cdk/issues/999999)) (deadb33f), closes [#999993](https://github.com/aws/aws-cdk/issues/999993)

### Bug Fixes
* **core:** transmorgrifier sometimes clones subject ([#999991](https://github.com/aws/aws-cdk/issues/15313)) (0ddba11), closes [#999990](https://github.com/aws/aws-cdk/issues/999990)

--
## Alpha Modules (v2.1.0-alpha.0)

### BREAKING CHANGES
* **newbar:** default answer to life, universe and everything changed from 41 to 42.

### Features
* **newbar:** add support for adding foos ([#999999](https://github.com/aws/aws-cdk/issues/999999)) (b01dface), closes [#999998](https://github.com/aws/aws-cdk/issues/999998)

### Bug Fixes
* **newbar:** answer to life has off-by-one error ([#999991](https://github.com/aws/aws-cdk/issues/15313)) (0ddba11), closes [#999990](https://github.com/aws/aws-cdk/issues/999990)

My justification for this is that you will have to write the code to produce this format anyway (for the GitHub release). If that's the case, why not do it here, and put this logic in cdk-release?

@njlynch njlynch requested a review from skinny85 August 31, 2021 10:00
@njlynch
Copy link
Copy Markdown
Contributor Author

njlynch commented Aug 31, 2021

My justification for this is that you will have to write the code to produce this format anyway (for the GitHub release). If that's the case, why not do it here, and put this logic in cdk-release?

Because the scenarios are different. With the GitHub release, we have no choice but to combine everything together. With the in-source Changelog, we have the option of providing a "clean" Changelog that only shows the changes associated with aws-cdk-lib. I believe that's valuable.

Also, the level of indentation between both is different. The main Changelog has the version/release at an H2, whereas the GitHub release notes has it as an H1/title. That allows for better nesting without having to rewrite as much code. Finally, we actually don't know that the combined format is reasonable from an implementation perspective, and the agreement in the RFC was to try the combined format if it was simple enough, and otherwise link to the individual Changelogs.

Copy link
Copy Markdown
Contributor

@skinny85 skinny85 left a comment

Choose a reason for hiding this comment

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

👍

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 31, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit b603675 into master Aug 31, 2021
@mergify mergify bot deleted the njlynch/alpha-changelogs branch August 31, 2021 15:53
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 31, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: cd16af4
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

TikiTDO pushed a commit to TikiTDO/aws-cdk that referenced this pull request Sep 6, 2021
This is part of the continued work to release the experimental modules as
independent alpha modules. This change introduces a new mode for handling
changes in the changelog: in this new mode, all changes from alpha modules are still
stripped from the main changelog (as they are currently for v2); those alpha module
changes are now also written to a dedicated changelog (e.g., `CHANGELOG.v2.alpha.md`).

related aws#15591

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
david-doyle-as24 pushed a commit to david-doyle-as24/aws-cdk that referenced this pull request Sep 7, 2021
This is part of the continued work to release the experimental modules as
independent alpha modules. This change introduces a new mode for handling
changes in the changelog: in this new mode, all changes from alpha modules are still
stripped from the main changelog (as they are currently for v2); those alpha module
changes are now also written to a dedicated changelog (e.g., `CHANGELOG.v2.alpha.md`).

related aws#15591

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

contribution/core This is a PR that came from AWS.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants