make build/version -r 1-based so dev packages are revision 1 - #47
Merged
Conversation
build/version -r was 0-based on release lines (0 on the tag) with the Makefiles adding +1, but it returned 1 on dev branches, so dev packages came out as revision 2 (x.y.z-<n>-g<sha>-2) while master releases were 1. Move the +1 into the -r path (release lines only; dev is already 1) and drop it from the Makefiles, so -r is uniformly 1-based: the tagged release and dev builds are build number 1. master on tag asmt_x.y.z-1<os>... (unchanged) master N past asmt_x.y.z-<N+1><os>... (unchanged) dev asmt_x.y.z-<n>-g<sha>-1<os>... (was -2) Default/full mode (bare x.y.z on the release, 0-based -n commits-ahead count) is left unchanged. Matches the 1-based convention in aerospike/act#81 and aerospike-tools-validation#41. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
mcoberly2
approved these changes
Jul 30, 2026
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
2 participants
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.
Summary
Follow-up to #42.
build/version -rwas 0-based on release lines (0 on the tag) with the Makefiles adding+1, but it returned 1 on dev branches — so dev packages came out as revision 2 (x.y.z-<n>-g<sha>-2) while master releases were1. This makes-runiformly 1-based so dev packages are-1, consistent with the tagged release.Change
build/version: move the+1into the-r(build_only) path — applied on release lines only; dev branches already return1.-ris now the 1-based build number directly.pkg/Makefile.{deb,rpm}:BUILD_NUMBER = build/version -r(dropped theexpr … + 1)._build_numberand the default/full-mode output (barex.y.zon the release tag, 0-based-ncommits-ahead count) are unchanged.Package names
asmt_x.y.z-1<os>…asmt_x.y.z-1<os>…(unchanged)asmt_x.y.z-<N+1><os>…asmt_x.y.z-<n>-g<sha>-2<os>…asmt_x.y.z-<n>-g<sha>-1<os>…Brings asmt in line with the 1-based convention in aerospike/act#81 and aerospike-tools-validation#41.
Test plan
bash -n build/version; scratch-repo verification of master on/off-tag, dev-r= 1 on dev and on the tagged release, 3 two commits past