Repository navigation
Conversation
Code-signing services (SignPath Foundation, ActivityWatch/activitywatch#632) require product name/version metadata on each signed executable. The Rust binaries in the Windows bundle currently ship without a VERSIONINFO resource. Generate the resource script in OUT_DIR and link it via embed-resource's compile_for, which scopes it to the named binary target only: the aw-server library (used by aw-tauri) gets no resource, so no duplicate VERSIONINFO. No-op for non-Windows targets, including Android. AW_VERSION, when set, overrides the product version so all bundled exes report the release version. CI asserts the resource on the windows-latest build. Git-Session-Id: 8ff886b3-a994-4b4f-9425-e72784bd3d1c
Review guide (auto-posted)Structured warm-up for reviewers — what changed, what to run, where to look. Key files
Suggested verification
Known risks / watch points
Suggested review focus
Generated by |
[Low impact] The PR appears safe to merge; the previous finding is fixed and no new actionable issues were found. SummaryAdds Windows version metadata to
Reviews (2) · Last reviewed commit: "fix(windows): require resource compiler ..." · Reviewed by Greptile |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #863 +/- ##
===========================================
+ Coverage 70.81% 85.87% +15.05%
===========================================
Files 51 89 +38
Lines 2916 13030 +10114
===========================================
+ Hits 2065 11189 +9124
- Misses 851 1841 +990 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
🤖 AI code reviewAdds a shared Windows VERSIONINFO resource generator used by the aw-server and aw-sync build scripts, with embed-resource added as a build dependency. FileVersion uses the crate version, while ProductVersion accepts an AW_VERSION override. The Windows CI workflow checks both executables’ metadata, rebuilds with a synthetic override, and restores the fallback versions. Safe to merge — no P0/P1 findingsConfidence 5/5
✅ No findings. The diff looks correct to me on this pass. Files changed (6) — the diff as I read it
Previous review passes
Reviewed Maintainer commands
|
|
Verified the uploaded Windows binaries from run 43618351989, head Two changes remain: assert the actual file/product versions in CI, including a known |
Git-Session-Id: 7e20fb0e-1567-5ea7-bba7-499e7eeeafa8
|
@greptileai review |
Review disposition — maintainer decision
No further Greptile review requested and no merge attempted. Recommend maintainer consideration once the remaining CI check completes; this does not waive repository merge gates. |
|
CI-green and mergeable (Greptile 5/5) — waiting only on a maintainer click. This PR is ready to merge, but the bot has pull-only access to this repo and can't self-merge — surfacing it here so it isn't lost. The monitoring loop will stop re-flagging it now that this note is posted. |
* build(windows): export AW_VERSION to the Rust builds The aw-server-rust and aw-notify build scripts embed AW_VERSION as the PE ProductVersion (ActivityWatch/aw-server-rust#863, ActivityWatch/aw-notify-rs#48). Export it from the bundle Makefile on Windows, using the same value package-all.sh gives the Python executables and the installer (no v prefix, no -research suffix), so every signed executable in the bundle reports one release version. An explicit AW_VERSION in the environment is kept. Git-Session-Id: 10536267-7445-4d74-b935-9a27edb7aed2 * fix(tests): normalize research suffix in AW_VERSION expectation Git-Session-Id: cfb8409c-0e1b-5e0e-9ced-0399f97d2c4d
Code-signing services (SignPath Foundation, ActivityWatch/activitywatch#632) require product name/version metadata on each signed executable. Same build-script approach as ActivityWatch/aw-server-rust#863: generate a VERSIONINFO .rc in OUT_DIR and link it to the aw-notify binary only via embed-resource's compile_for. No-op for non-Windows targets. AW_VERSION, when set, overrides the product version. CI asserts the resource on the Windows release build. Git-Session-Id: 8ff886b3-a994-4b4f-9425-e72784bd3d1c
Part of Windows code signing via SignPath Foundation (ActivityWatch/activitywatch#632, raised in priority by ActivityWatch/activitywatch#1558: Smart App Control blocks unsigned v0.14.2 with no "run anyway"). SignPath requires product name/version metadata on every signed binary. ActivityWatch/activitywatch#1559 adds it to the PyInstaller exes. This PR covers the two Rust exes in the Windows bundles:
aw-server.exe(Qt bundle) andaw-sync.exe(both bundles).What it does
build-support/windows_resource.rs, included by theaw-serverand newaw-syncbuild scripts, writes aVERSIONINFOresource script toOUT_DIRand links it withembed-resource'scompile_for.compile_foremitsrustc-link-arg-bin=<bin>=…, so the resource reaches only that binary target. Theaw-serverlibrary that aw-tauri depends on gets none, so aw-tauri's ownVERSIONINFOis not duplicated.CARGO_CFG_TARGET_OS, so cross builds also work).ActivityWatch, CompanyNameActivityWatch Contributors. FileVersion is the crate version. ProductVersion comes fromAW_VERSIONwhen set, otherwise the crate version, so the bundle can make every exe report the release version.windows-latestbuild readsVersionInfofor both exes and fails if the resource is missing.Verified locally (Linux): the workspace builds with the resource step as a no-op, and
cargo fmt --check,rustfmt --checkon the included file andcargo clippyonaw-server/aw-syncare clean. The Windows link path is verified only by this PR'swindows-latestjob.New build-only dependencies:
embed-resourceplus its small dependency tree (vswhom,winreg,rustc_version). Nothing changes in the runtime dependency graph.Open-PR cap override: Bob has 12 open PRs here (the cap is 10). I opened this one anyway because it is a small prerequisite for the Windows signing that was re-prioritized on #632 today. It is not new feature scope.