Minor changes to version tracking between release and master#1093
Open
dkcumming wants to merge 6 commits into
Open
Minor changes to version tracking between release and master#1093dkcumming wants to merge 6 commits into
release and master#1093dkcumming wants to merge 6 commits into
Conversation
- `master` branch now has all versions as sentinel 0.0.0;
- master-push.yml on `release` branch will read previous version from
that branch, conflicts will default to `release` so 0.0.0 is never
merged from `master` to `release`;
- Commit trailer "Bump: {major, minor, patch}" now instruct how to bump
the version
- version.sh updated to take argument stripped from commit trailer
- TODO: write out docs/dev/releasing.md at the end
This means that local builds will fail unless they have the same version that CI uses. If we want to test with a differnt version, we can remove the section from the pyproject.toml file.
- Added `kmir --version` to test-package.sh - Default `bump_level` to patch in master-push.yml for safety - Explicitly mention assumption that github strategy "ours" should only differ on version files - Mention in README.md that specific uv version is needed now
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
masterbranch had discrepancies between versions scattered across the repo, all since #606. This PR makes things a little easier to understand by:masterversions to sentinel value 0.0.0;releasebranch to bump the version by reading from the last version onrelease(no cross contamination);uvversion for local machines to stop drift and mismatch between local builds and CI;kmir --versionto print the current version;* Commit trailers are one liners of either "Bump: major", "Bump: minor", or "Bump: patch" in a commit or squash message as a single line that tell bump script if it should what the bump level is for the semver. Patch is defaulted if nothing is written in the commit message.
closes: #1078