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

chore: add a script for, and update the release process for updating the 4.x docs branch #3972

Merged
merged 3 commits into from
Apr 16, 2024

Conversation

trentm
Copy link
Member

@trentm trentm commented Apr 12, 2024

Now that we need to use a PR to update the 4.x branch for a release, I've added a script to help with this.

This script was used for #3971 for the v4.5.2 release.

@trentm trentm requested a review from david-luna April 12, 2024 17:23
@trentm trentm self-assigned this Apr 12, 2024
david-luna
david-luna previously approved these changes Apr 12, 2024
@trentm
Copy link
Member Author

trentm commented Apr 13, 2024

Note to self: When I merged #3971, by default the commit message included the commit messages from all the cherry-picked changes. I don't know if we really want that. (I removed all the commit message body content before merging this particular PR.) My curr preference would be to have these squashed commits to 4.x not have all these details repeated in the commit messages.

An option would be to have the script squash all the commits into one before creating the PR. We would then lose all the separation of commits on the PR for browsing them, but I don't think that is that valuable. It is somewhat valuable to keep the listing of included cherry-picked commits in the PR description.

david-luna
david-luna previously approved these changes Apr 16, 2024
Copy link
Member

@david-luna david-luna left a comment

Choose a reason for hiding this comment

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

thanks for making releases easier for us :)

@trentm trentm merged commit 55879d7 into main Apr 16, 2024
20 checks passed
@trentm trentm deleted the trentm/chore-docs-branch-update branch April 16, 2024 20:49
david-luna pushed a commit that referenced this pull request Apr 24, 2024
PeterEinberger pushed a commit to fpm-git/apm-agent-nodejs that referenced this pull request Aug 20, 2024
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