Skip to content

build(deps): bump submodules for v0.14.0b5-research - #1428

Open
TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:dev/b5-research-submodule-bump
Open

build(deps): bump submodules for v0.14.0b5-research#1428
TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:dev/b5-research-submodule-bump

Conversation

@TimeToBuildBob

@TimeToBuildBob TimeToBuildBob commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Bumps the four submodules that carry the Research Edition fixes promised to the LU study contact for early next week, so v0.14.0b5-research can be cut from master.

Submodule From To Carries
aw-watcher-window 05c0d92 14ecd58 ActivityWatch/aw-watcher-window#138 — longest-match classification: Google Docs/Drive/Calendar/Meet move from Search & Navigation to Work & Productivity
aw-server-rust c8533a0 d2e7b80 ActivityWatch/aw-server-rust#663, #668 → aw-webui 13a9428: Research Edition header badge (aw-webui#941), shipped preset category set (aw-webui#936), server-info TypeError guard (aw-webui#933)
aw-tauri 274b535 2daab4a ActivityWatch/aw-tauri#252 — locks all six embedded aw-server-rust packages to d2e7b80, matching the top-level Rust server submodule
aw-server a693cac 2fbe204 ActivityWatch/aw-server#167, #168, #169--profile port/settings isolation, so a Research Edition install can run beside a normal one

Why aw-server-rust matters here

.github/workflows/release.yml caches and builds aw-server-rust/aw-webui, so the web UI that actually ships in the bundle comes from the aw-server-rust pin, not the aw-server one. aw-server's aw-webui pin (a568c84) is the pre-merge branch form of the badge commit; the merged form is 71087a2, already an ancestor of 13a9428. Bumping only aw-server would have left all three UI fixes out of the release.

Tauri resolves the same Rust server independently through aw-tauri/src-tauri/Cargo.lock, so aw-tauri must move with the top-level aw-server-rust pin. ActivityWatch/aw-tauri#252 updates that lock to d2e7b80; this PR points aw-tauri at its merge commit so Qt and Tauri package the same server revision.

Release-gate check

release.yml verifies both that the Rust server's major.minor matches the release tag and that Tauri's lock matches the top-level aw-server-rust submodule. With aw-server-rust at d2e7b80 and aw-tauri at 2daab4a, the local gate passes:

$ python3 scripts/check_tauri_server.py 0.14.0b5-research
ActivityWatch release: 0.14.0b5-research
aw-server-rust:       0.14.0 @ d2e7b803d6d7
Tauri Cargo.lock:     0.14.0 @ d2e7b803d6d7
OK: Qt and Tauri will bundle the same aw-server-rust revision

Ref: ErikBjare/bob#1108

@greptile-apps

greptile-apps Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

Updates four component submodules for the v0.14.0b5-research release:

  • Advances both server implementations for Research Edition UI and profile-isolation fixes.
  • Advances the window watcher for the revised productivity classification.
  • Advances aw-tauri alongside aw-server-rust, addressing the previously reported Tauri server-pin synchronization issue.

Confidence Score: 5/5

The 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 aw-tauri alongside aw-server-rust, restoring the coordinated pin update required by the release consistency guard, and no new actionable issue is established by the gitlink changes.

Important Files Changed

Filename Overview
aw-server Advances the Python server submodule for Research Edition profile and settings isolation.
aw-server-rust Advances the Rust server and shipping web UI to the intended Research Edition revisions.
aw-tauri Advances Tauri together with the Rust server, resolving the previously reported stale-lock mismatch.
aw-watcher-window Advances the window watcher to include the revised longest-match activity classification.

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]
Loading

Reviews (2): Last reviewed commit: "build(deps): sync aw-tauri server lock f..." | Re-trigger Greptile

Comment thread aw-server-rust
@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

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 (scripts/check_tauri_server.py). aw-tauri/src-tauri/Cargo.lock git-locks aw-server-rust at c8533a0, so advancing the superproject submodule to d2e7b80 breaks the parity guard added after v0.14.0b4 Tauri shipped aw-server-rust 0.13.1.

My PR description above was wrong to say aw-tauri needs no bump: its submodule gitlink is current (274b535), but the revision that actually matters is the one inside its Cargo.lock.

Fix chain:

  1. build(deps): bump embedded aw-server-rust to d2e7b80 aw-tauri#252 — bumps the six git-locked aw-server-rust packages in src-tauri/Cargo.lock to d2e7b80. No Cargo.toml changed in that range (only .rs sources and the aw-webui submodule), so the dependency graph is unchanged.
  2. Then I add aw-tauri → aw-tauri#252's merge commit to this PR, and the parity check passes.

The Qt jobs, CodeQL and the greeting job are unaffected by this; only the Tauri matrix is red.

ErikBjare pushed a commit to ActivityWatch/aw-tauri that referenced this pull request Sep 4, 2026
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.
@ErikBjare

Copy link
Copy Markdown
Member

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

Thanks — I pulled the merged companion into this PR.

Pushed 17cd24d, advancing aw-tauri to merge commit 2daab4a from ActivityWatch/aw-tauri#252. Verified locally with:

$ python3 scripts/check_tauri_server.py 0.14.0b5-research
ActivityWatch release: 0.14.0b5-research
aw-server-rust:       0.14.0 @ d2e7b803d6d7
Tauri Cargo.lock:     0.14.0 @ d2e7b803d6d7
OK: Qt and Tauri will bundle the same aw-server-rust revision

Fresh CI is running on the updated head. I’m re-requesting Greptile now because the pushed commit directly addresses its P1 summary finding.

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

@greptileai review

Git-Session-Id: 887c0fb4-7b59-52f3-881b-ed573121e770
@TimeToBuildBob
TimeToBuildBob force-pushed the dev/b5-research-submodule-bump branch from 17cd24d to f79ca72 Compare September 4, 2026 15:26
@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

Rebased and force-pushed f79ca72 onto current master; #1428 is now mergeable.

Erik’s newer master submodule sweep had already advanced aw-server, aw-tauri, and aw-watcher-window past this PR’s requested revisions. The rebase kept those newer pins and retained the one necessary delta: aw-server-rust is pinned to d2e7b80, matching the d2e7b80 lock still present in current aw-tauri (20a4f40). Verified locally:

$ python3 scripts/check_tauri_server.py 0.14.0b5-research
ActivityWatch release: 0.14.0b5-research
aw-server-rust:       0.14.0 @ d2e7b803d6d7
Tauri Cargo.lock:     0.14.0 @ d2e7b803d6d7
OK: Qt and Tauri will bundle the same aw-server-rust revision

This also repairs current master: its latest release run fails all five Tauri jobs because master had aw-server-rust=df9c4fa while Tauri still locks d2e7b80. Fresh PR CI is running on the rebased head.

@ErikBjare

Copy link
Copy Markdown
Member

@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.

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

Agreed. The bundle should own the one server revision used by both frontends; requiring a second PR just to regenerate aw-tauri/Cargo.lock is the wrong dependency direction.

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 aw-tauri/src-tauri/Cargo.toml so the aw-server and aw-datastore git dependencies use the checked-out aw-server-rust submodule via path, then regenerate/verify the lock before the Tauri build. That makes the top-level gitlink authoritative and removes the cross-repo lockstep update. I’ll validate Cargo’s sibling path dependencies and ship that separately rather than mixing build-system surgery into the b5 release fix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants