Makefile,*: use tailscale.com/cmd/mkversion #546
Merged
Conversation
This file contains 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
raggi
force-pushed
the
raggi/versioning
branch
3 times, most recently
from
29cc00f to
e2b3b51
Compare
bradfitz
reviewed
Oct 18, 2024
| @@ -38,3 +38,5 @@ tailscale.jks | |||
| libtailscale.aar | |||
| libtailscale-sources.jar | |||
| .DS_Store | |||
|
|
|||
| tailscale.version | |||
There was a problem hiding this comment.
I thought we were going to check this file in to the repo? Or did you not git add it?
There was a problem hiding this comment.
I was hoping to, but as it contains the local git sha as well, that would get stale, so I wanted to reduce the possibility of the file not being updated and the stale version information being included.
bradfitz
reviewed
Oct 18, 2024
Comment on lines
+131
to
+132
| $(shell ./tool/go run tailscale.com/cmd/mkversion > tailscale.version) | ||
|
|
There was a problem hiding this comment.
oh, so we're still doing the full git clone pain, just hidden behind this tool
There was a problem hiding this comment.
yeah, at least we now are down to one implementation of that behavior though!
bradfitz
reviewed
Oct 18, 2024
There was a problem hiding this comment.
Updates
You can use the F-Droid woes bug: tailscale/tailscale#13850
raggi
force-pushed
the
raggi/versioning
branch
2 times, most recently
from
5bc9fc0 to
9a98b16
Compare
bradfitz
approved these changes
Oct 19, 2024
Comment on lines
+131
to
+132
| $(shell ./tool/go run tailscale.com/cmd/mkversion > tailscale.version) | ||
|
|
| @@ -38,7 +38,7 @@ android { | |||
| minSdkVersion 26 | |||
| targetSdkVersion 34 | |||
| versionCode 241 | |||
| versionName "1.77.12-ta8f9c0d6e-g753b8d3fb4b" | |||
| versionName getVersionProperty("VERSION_LONG") | |||
Comment on lines
+186
to
+194
| def getVersionProperty(key) { | ||
| // tailscale.version is created / updated by the makefile, it is in a loosely | ||
| // Makfile/envfile format, which is also loosely a properties file format. | ||
| // make tailscale.version | ||
| def versionProps = new Properties() | ||
| versionProps.load(project.file('../tailscale.version').newDataInputStream()) | ||
| return versionProps.getProperty(key).replaceAll('^\"|\"$', '') | ||
| } |
andrew-d
reviewed
Oct 31, 2024
We've suffered misalignment in versioning and toolchain usage due to the shell invocations downstream of ./version/tailscale-version.sh, but also the whole version data scheme in the Makefile was quite complicated, and required synchronization in the build.grade. - Makfile no longer needs to be version aware itself. - A Makefile target tailscale.version refreshes a local cached output from tailscale.com/cmd/mkversion which is updated when go.mod / go.sum change. - build.gradle loads tailscale.version to get the version string. - ldflags are produced from tailscale.version via version-ldflags.sh Updates tailscale/tailscale#13850 Signed-off-by: James Tucker <[email protected]>
raggi
force-pushed
the
raggi/versioning
branch
from
9a98b16 to
62e43af
Compare
raggi
added a commit
that referenced
this pull request
Oct 31, 2024
The explicit target was removed during patch production, but the dependency wasn't removed from the clean action. Updates #546 Updates tailscale/tailscale#13850
raggi
added a commit
that referenced
this pull request
Oct 31, 2024
The explicit target was removed during patch production, but the dependency wasn't removed from the clean action. Updates #546 Updates tailscale/tailscale#13850
raggi
added a commit
that referenced
this pull request
Oct 31, 2024
The explicit target was removed during patch production, but the dependency wasn't removed from the clean action. Updates #546 Updates tailscale/tailscale#13850 Signed-off-by: James Tucker <[email protected]>
raggi
added a commit
that referenced
this pull request
Oct 31, 2024
The explicit target was removed during patch production, but the dependency wasn't removed from the clean action. Updates #546 Updates tailscale/tailscale#13850 Signed-off-by: James Tucker <[email protected]>
raggi
added a commit
that referenced
this pull request
Oct 31, 2024
The explicit target was removed during patch production, but the dependency wasn't removed from the clean action. Updates #546 Updates tailscale/tailscale#13850 Signed-off-by: James Tucker <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We've suffered misalignment in versioning and toolchain usage due to the
shell invocations downstream of ./version/tailscale-version.sh, but also
the whole version data scheme in the Makefile was quite complicated, and
required synchronization in the build.grade.
from tailscale.com/cmd/mkversion which is updated when go.mod / go.sum
change.
Updates tailscale/tailscale#13850