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

Fix 'campgrounds' mandatory parameters 'start-date' documentation #92

Conversation

acaloiaro
Copy link
Contributor

Block on #91

@juftin
Copy link
Owner

juftin commented Jul 4, 2022

Thanks for this @acaloiaro. What's the plan for the merge order/plan of these two PRs?

@acaloiaro
Copy link
Contributor Author

Because of the _version.py dependency, I figured it would make more sense for #91 to be merged first since it would create an odd git history if a later version was merged into history before an earlier one. I'll defer to your expertise on the project here :)


With that said, if you'd be interested in using python-semantic-release, I'd be happy to open a PR that adds automatic versioning to the current Github Actions. That would make merge ordering moot, as the value in _version.py would be bumped in merge sequence.

One caveat with python-semantic-release is that it mandates using Angular's commit message format (https://gist.github.com/brianclements/841ea7bffdb01346392c#type), which some people understandably find onerous.

@acaloiaro
Copy link
Contributor Author

Also @juftin -- if #91 is merged first I can rebase main onto this branch to get the documentation fix.

@juftin
Copy link
Owner

juftin commented Jul 4, 2022

Hey @acaloiaro that plan sounds good. #91 was just merged, let's rebase and go with this.

I'll check out the Auto Version Incrementing out and consider it, it sounds useful. I'm a big fan of my existing release infra, release-drafter/release-drafter in GitHub Actions. An ideal solution in my mind would compliment that and probably use GitHub Actions to auto-increment a version based on labels (like minor, major, patch`).

@acaloiaro acaloiaro force-pushed the fix-campgrounds-mandatory-parameters-documentation branch from 8a83cac to 8b31aaa Compare July 4, 2022 20:48
@acaloiaro
Copy link
Contributor Author

Hey @acaloiaro that plan sounds good. #91 was just merged, let's rebase and go with this.

I'll check out the Auto Version Incrementing out and consider it, it sounds useful. I'm a big fan of my existing release infra, release-drafter/release-drafter in GitHub Actions. An ideal solution in my mind would compliment that and probably use GitHub Actions to auto-increment a version based on labels (like minor, major, patch`).


Yeah that sounds sensible. I've always used semantic version's publish command which versions and pushes to github releases, but it also has a version command which only increments versions in code and commits the change. That might be worth looking into as a complement to release-drafter.


Rebase done -- everything should be good to go.

Copy link
Owner

@juftin juftin left a comment

Choose a reason for hiding this comment

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

This looks good. Thanks for all of the improvements

@juftin juftin merged commit cf9b532 into juftin:main Jul 11, 2022
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

2 participants