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

Update version with patch. #310

Merged
merged 9 commits into from
Jul 5, 2024
Merged

Update version with patch. #310

merged 9 commits into from
Jul 5, 2024

Conversation

jvanderaa
Copy link
Collaborator

Sets patch release.

@jvanderaa
Copy link
Collaborator Author

Fixes #311

Copy link
Contributor

@glennmatthews glennmatthews left a comment

Choose a reason for hiding this comment

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

Although it's not spelled out yet in the project docs so far as I can see, I think the usual process for a release would be to do a release-branch PR into main (including release-note updates, etc.) rather than directly bumping the version in develop. Happy to collaborate with you on this if needed.

@jvanderaa
Copy link
Collaborator Author

So I would cut a new branch off of develop, PR that to main, then merge main back to develop?

@glennmatthews
Copy link
Contributor

That's how we do things in core at least.

@jvanderaa
Copy link
Collaborator Author

I can do that then. What I've been doing on pynautobot, nautobot-ansible is:

merge pieces into develop
when ready PR develop into main and then cut release.

@jvanderaa jvanderaa changed the base branch from develop to main July 1, 2024 19:51
@chadell
Copy link
Contributor

chadell commented Jul 2, 2024

I guess the changelog is failing because the release file? is the first time I see it and I have not used it before for the releases

@glennmatthews
Copy link
Contributor

Changelog CI is failing because any PR into develop needs to have a changes/<issue or pr>.<change type> file as a part of the PR. https://github.com/nautobot/nautobot-app-circuit-maintenance/blob/develop/docs/dev/contributing.md#creating-changelog-fragments

@glennmatthews
Copy link
Contributor

I see that the target of the PR was changed correctly to main; in that case we need to run towncrier to get the existing change fragments collected into the release-note.

@jvanderaa
Copy link
Collaborator Author

Ok, this was a case of not following the new documentation. I have some questions on it with one change that we should make. The part about tags. It says to create a tag. Shouldn't that be Create a Release? What are the differences?

@jvanderaa
Copy link
Collaborator Author

@chadell I think this should be all set.

Copy link
Contributor

@glennmatthews glennmatthews left a comment

Choose a reason for hiding this comment

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

The release process after this is merged should indeed be to create a Release and in the process of doing so, have GitHub create a v2.2.3 tag for the release.

changes/311.release Outdated Show resolved Hide resolved
Copy link
Contributor

@chadell chadell left a comment

Choose a reason for hiding this comment

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

LGTM

@chadell chadell merged commit 947c93e into main Jul 5, 2024
16 checks passed
@chadell chadell deleted the patch-version_2_2_3 branch July 5, 2024 09:17
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.

None yet

3 participants