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

feat: doc-deploy-changelog action #452

Merged
merged 57 commits into from Apr 11, 2024
Merged

Conversation

klmcadams
Copy link
Contributor

This action creates a new section in the CHANGELOG.md file using the towncrier file fragments located in doc/changelog.d. By default, it updates the CHANGELOG in the release branch corresponding to the tag. For example, if the tag is v0.1.0, the action is going to assume its release branch is "release/0.1". Once it updates the changelog in the release branch, it creates a pull request into main containing the changelog update and the deleted fragment files, deletes the old tag, and recreates it with the changelog update.

If you add the "package" line under the "tool.towncrier" section and set it equal to the value of the name in "tool.flit.module" ("ansys.."), towncrier will use the version listed in the pyproject.toml file. Otherwise, it will take the version from the tag: v0.1.0 -> 0.1.0.

The action also handles cherry-pick conflicts. It takes all of "their" changes, which are the changes from the initial changelog update & fragment files being deleted.

If for some reason you push a tag, v0.2.0 and the release branch, release/0.2, doesn't exist, the action will use the temporary branch to update the changelog & merge the changes into main. This may be an overkill check, so if you think it's unnecessary it can be removed.

@klmcadams klmcadams requested a review from a team as a code owner April 9, 2024 22:16
@ansys-reviewer-bot
Copy link
Contributor

Thanks for opening a Pull Request. If you want to perform a review write a comment saying:

@ansys-reviewer-bot review

@github-actions github-actions bot added the enhancement New features or code improvements label Apr 9, 2024
Copy link
Member

@RobPasMue RobPasMue left a comment

Choose a reason for hiding this comment

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

Awesome job @klmcadams - can't wait to try it out. Just left a few comments (mostly editorial). Logic seems to work fine.

doc/source/migrations/index.rst Outdated Show resolved Hide resolved
doc/source/migrations/index.rst Outdated Show resolved Hide resolved
doc-deploy-changelog/action.yml Outdated Show resolved Hide resolved
doc-deploy-changelog/action.yml Outdated Show resolved Hide resolved
Copy link
Member

@RobPasMue RobPasMue left a comment

Choose a reason for hiding this comment

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

This should fix the doc-build errors

doc/source/migrations/doc-deploy-changelog-setup.rst Outdated Show resolved Hide resolved
doc/source/migrations/doc-deploy-changelog-setup.rst Outdated Show resolved Hide resolved
doc/source/migrations/doc-deploy-changelog-setup.rst Outdated Show resolved Hide resolved
doc/source/migrations/doc-deploy-changelog-setup.rst Outdated Show resolved Hide resolved
doc/source/migrations/doc-deploy-changelog-setup.rst Outdated Show resolved Hide resolved
doc/source/migrations/doc-deploy-changelog-setup.rst Outdated Show resolved Hide resolved
@jorgepiloto jorgepiloto added release Anything related to an incoming release blocked Cannot address this till other issues are solved first labels Apr 10, 2024
@jorgepiloto
Copy link
Member

Just labeling this with the blocked for release, similar to other PRs. We will merge all together just before releasing v6.

@RobPasMue
Copy link
Member

@jorgepiloto - this shouldn't be blocked I believe. We could merge it to main like we've done with others. Especially now that we are close to v6.

klmcadams and others added 2 commits April 10, 2024 09:46
Co-authored-by: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>
@jorgepiloto jorgepiloto removed the blocked Cannot address this till other issues are solved first label Apr 11, 2024
@klmcadams klmcadams merged commit ed653a4 into main Apr 11, 2024
16 checks passed
@klmcadams klmcadams deleted the feat/doc-changelog-release branch April 11, 2024 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New features or code improvements release Anything related to an incoming release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants