Skip to content

chore(deps): bump aw-server-rust to 18fb62e (11 commits) - #1527

Closed
TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:chore/bump-aw-server-rust
Closed

TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:chore/bump-aw-server-rust

Conversation

@TimeToBuildBob

Copy link
Copy Markdown
Contributor

Bumps the aw-server-rust submodule from 04e8d666 to 18fb62e (11 commits).

Changes picked up

Picks up:
- feat(server): bulk event delete endpoint (ActivityWatch#781)
- feat(query): per-request time budget and slow-query logging (ActivityWatch#806)
- feat(server): serve query reads from a read-only datastore handle (ActivityWatch#807)
- feat(android): add setSetting JNI binding (ActivityWatch#816)
- fix(query_cache): bound pending_flush to write_log_size, skip when no reader (ActivityWatch#818)
- fix(android): force-commit setSetting before reporting ok (#817)
- test(server): verify stopwatch acknowledgements survive process restart (ActivityWatch#814)
- plus CI and dependency updates

Git-Session-Id: b9482b68-d472-4d7f-aeef-94405ac5ff03
@greptile-apps

greptile-apps Bot commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[High impact] No established defect blocks merging this pointer update.

Summary

Updates aw-server-rust from 04e8d666 to 18fb62e.

  • The repository now points to a newer aw-server-rust revision.

Reviews (1) · Last reviewed commit: "chore(deps): bump aw-server-rust to 18fb..." · Reviewed by Greptile

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

CI root cause: this PR bumps the top-level aw-server-rust submodule to 18fb62e, but aw-tauri's src-tauri/Cargo.lock still locks aw-server-rust at 04e8d66. The failing Build Tauri artifacts jobs run scripts/check_tauri_server.py, which rejects that mismatch by design:

ERROR: inconsistent aw-server build inputs:
  - Tauri locks aw-server-rust 04e8d666cb65, but the release submodule is 18fb62e99292

The repo treats aw-tauri's Cargo.lock as the source of truth — the top-level pin follows it, not the other way round. #1516 moved the top-level pin back to Tauri's lock for exactly this reason, and make sync-tauri-server syncs the submodule to Tauri's lock (not vice versa).

That lock move already exists: ActivityWatch/aw-tauri#291 (dependabot, green + mergeable) bumps the aw-server-rust group in /src-tauri/Cargo.lock from 04e8d66 to 18fb62e — the exact revision this PR pins. Once it merges, activitywatch needs the alignment (bump the aw-tauri submodule pin to #291's merge commit and the aw-server-rust pin to 18fb62e, with scripts/check_tauri_server.py <version> passing).

Closing this as premature so it doesn't sit permanently red; the alignment will be redone once aw-tauri#291 lands. I can't merge #291 myself (only triage on ActivityWatch/aw-tauri) — it needs a maintainer click.

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.

1 participant