build(deps): bump submodules for v0.14.0b5-research - #1428
Conversation
Greptile SummaryUpdates four component submodules for the
Confidence Score: 5/5The PR appears safe to merge; the new Tauri submodule update addresses the only previously reported release-blocking mismatch. The changes since the previous review advance Important Files Changed
Flowchart%%{init: {'theme': 'neutral'}}%%
flowchart LR
Root[ActivityWatch release] --> Python[aw-server 2fbe204]
Root --> Rust[aw-server-rust d2e7b80]
Root --> Tauri[aw-tauri 2daab4a]
Root --> Window[aw-watcher-window 14ecd58]
Rust --> QtBundle[Qt / standard bundle]
Tauri --> TauriBundle[Tauri bundle with synchronized server lock]
Reviews (2): Last reviewed commit: "build(deps): sync aw-tauri server lock f..." | Re-trigger Greptile |
|
CI caught a real gap in this PR, and the fix needs one companion merge first. All five Build Tauri artifacts jobs fail at Verify Tauri and Qt embed the same aw-server-rust revision ( My PR description above was wrong to say aw-tauri needs no bump: its submodule gitlink is current ( Fix chain:
The Qt jobs, CodeQL and the greeting job are unaffected by this; only the Tauri matrix is red. |
Tracks aw-server-rust master past c8533a0: - #668 bumps aw-webui to 13a9428 (Research Edition badge, preset category set, server-info TypeError guard) - #663 adds an optional priority field for category rules No Cargo manifest changed between the two revisions (only .rs sources and the aw-webui submodule), so the dependency graph is unchanged and this is a pure source-revision update of the six git-locked aw-server-rust packages. Needed for ActivityWatch/activitywatch#1428: release.yml's check_tauri_server.py requires the Tauri Cargo.lock revision to match the superproject's aw-server-rust submodule pin, and that PR advances the submodule to d2e7b80.
|
Thanks — I pulled the merged companion into this PR. Pushed Fresh CI is running on the updated head. I’m re-requesting Greptile now because the pushed commit directly addresses its P1 summary finding. |
|
@greptileai review |
Git-Session-Id: 887c0fb4-7b59-52f3-881b-ed573121e770
17cd24d to
f79ca72
Compare
|
Rebased and force-pushed Erik’s newer master submodule sweep had already advanced This also repairs current |
|
@TimeToBuildBob I just manually merged a bunch of submodule updates, as you noticed, but I found the failure really annoying and surprising. This is unnecessarily difficult just to ship the same aw-server-rust. Could/should probably rewrite the Cargo.toml in bundle repo CI, or something. |
|
Agreed. The bundle should own the one server revision used by both frontends; requiring a second PR just to regenerate For this release, #1428 is now green and mergeable, so I’m not changing its build path. Follow-up design: in the bundle checkout, rewrite |
Bumps the four submodules that carry the Research Edition fixes promised to the LU study contact for early next week, so
v0.14.0b5-researchcan be cut frommaster.aw-watcher-window05c0d9214ecd58aw-server-rustc8533a0d2e7b8013a9428: Research Edition header badge (aw-webui#941), shipped preset category set (aw-webui#936), server-info TypeError guard (aw-webui#933)aw-tauri274b5352daab4ad2e7b80, matching the top-level Rust server submoduleaw-servera693cac2fbe204--profileport/settings isolation, so a Research Edition install can run beside a normal oneWhy
aw-server-rustmatters here.github/workflows/release.ymlcaches and buildsaw-server-rust/aw-webui, so the web UI that actually ships in the bundle comes from the aw-server-rust pin, not theaw-serverone.aw-server's aw-webui pin (a568c84) is the pre-merge branch form of the badge commit; the merged form is71087a2, already an ancestor of13a9428. Bumping onlyaw-serverwould have left all three UI fixes out of the release.Tauri resolves the same Rust server independently through
aw-tauri/src-tauri/Cargo.lock, soaw-taurimust move with the top-levelaw-server-rustpin. ActivityWatch/aw-tauri#252 updates that lock tod2e7b80; this PR pointsaw-tauriat its merge commit so Qt and Tauri package the same server revision.Release-gate check
release.ymlverifies both that the Rust server's major.minor matches the release tag and that Tauri's lock matches the top-levelaw-server-rustsubmodule. Withaw-server-rustatd2e7b80andaw-tauriat2daab4a, the local gate passes:Ref: ErikBjare/bob#1108