Merged
Conversation
Contributor
nickwitten
commented
Dec 7, 2025
nickwitten
commented
- Embed the sub-image hashes in the correct binary
- Always run cargo build for the control image. Previously if the output binary is present and there are changes in the source code, the recipe won't be run.
- Use cargo build in workspace context, not package context. This ensures that the binary isn't rebuilt between control-board--control and control-board--control--run targets without source changes.
- Pass argument to embed_img_hash.py for target binary path so that the script works for other control-board targets
nickwitten
force-pushed
the
dev/nick/makefile-fixes
branch
5 times, most recently
from
77b8b5c to
176f2cc
Compare
Contributor
Author
|
@guyfleeman these fixes are ready to go in my opinion. |
joe-spall
reviewed
Dec 10, 2025
| print(f"embed_git_status.py - WARNING - Unable to embed hash of '{img_path}' into '{embed_img_path}'") | ||
| print(traceback.format_exc()) | ||
| except Exception: | ||
| return False |
Contributor
There was a problem hiding this comment.
Useful to print the exception contents?
joe-spall
reviewed
Dec 10, 2025
| args = parser.parse_args() | ||
| target_bin = Path(args.bin) | ||
| if not target_bin.exists(): | ||
| print(f"embed_git_status.py - ERROR - Could not find target binary at path '{target_bin}'") |
Contributor
There was a problem hiding this comment.
Nit space below and newline after exit(1)
nickwitten
force-pushed
the
dev/nick/makefile-fixes
branch
from
176f2cc to
15c68e9
Compare
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.