Allow to specify the TinyPilot version identifier#1871
Merged
jotaen4tinypilot merged 5 commits intomasterfrom Mar 17, 2025
Merged
Allow to specify the TinyPilot version identifier#1871jotaen4tinypilot merged 5 commits intomasterfrom
jotaen4tinypilot merged 5 commits intomasterfrom
Conversation
db39
approved these changes
Mar 17, 2025
Contributor
db39
left a comment
db39
left a comment
There was a problem hiding this comment.
Automated comment from CodeApprove ➜
✔️ Approved
LGTM!
👀 @jotaen4tinypilot it's your turn please take a look
Contributor
Author
|
(Merging regardless of failing build, since it’s “just” our license URL test being flaky again.) |
jotaen4tinypilot
added a commit
that referenced
this pull request
Mar 26, 2025
Follow up of #1871. Git short hashes can be longer than 7 characters, see the [“Short SHA-1” section of the git docs](https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection). That’s relevant in our Pro repo, as you can [see in our latest build](https://app.circleci.com/pipelines/github/tiny-pilot/tinypilot-pro/4799/workflows/4ed6c793-a8f1-458e-b29c-434005e5ae0f/jobs/50173), where the output of `git describe --tags --long` yields `2.7.0-rc.4-5-g0bfe1e1f`, i.e. with 8 characters following the `-g`. Therefore, the regex replacement didn’t match. Contrary to [my assumption about config protection](tiny-pilot/tinypilot-pro#1475 (comment)) ([which wasn’t correct](tiny-pilot/tinypilot-pro#1475 (comment))), this seems to be the actual reason why the change didn’t have any effect in the PR build. <a data-ca-tag href="https://codeapprove.com/pr/tiny-pilot/tinypilot/1872"><img src="https://codeapprove.com/external/github-tag-allbg.png" alt="Review on CodeApprove" /></a> Co-authored-by: Jan Heuermann <jan@jotaen.net>
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
3 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.
Follow-up of https://github.com/tiny-pilot/tinypilot-pro/pull/1474, specifically https://github.com/tiny-pilot/tinypilot-pro/pull/1474#issuecomment-2725155594.
This PR modifies the interface of the
build-debian-pkgdev script so that it takes on multiple (optional) named flags, instead of just one (optional) position argument:--build-targetsflag replaces the previous positional input argument.--tinypilot-versionnow allows to set the version of the Debian package.git describe --tagscommand. We can still use it as implicit default, though. In Pro, we can then explicitly pass in the version identifier from the CircleCI build context – without, however, by directly making thebuild-debian-pkgscript depend on the CircleCI context, e.g. by referencing theCIRCLE_TAGenvironment variable inside ofbuild-debian-pkg.When inspecting the parameters of the actual build, the changes appear to work fine:
--platform linux/arm/v7 --build-arg TINYPILOT_VERSION=1.9.5-11+7fae51d(this PR)--platform linux/arm/v7 --build-arg TINYPILOT_VERSION=1.9.5-8+b6f3eb0(latest master)