Skip to content

fix(release): sync server submodule with Tauri lock - #1429

Open
TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:bob/fix-master-tauri-server-sync
Open

fix(release): sync server submodule with Tauri lock#1429
TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:bob/fix-master-tauri-server-sync

Conversation

@TimeToBuildBob

Copy link
Copy Markdown
Contributor

Problem

The latest two Release runs on master fail every Tauri matrix job at the server-consistency preflight. aw-tauri/src-tauri/Cargo.lock pins aw-server-rust at d2e7b803d6d7, while the top-level release submodule was independently advanced to df9c4fababf9.

Fix

Move the top-level aw-server-rust submodule back to the Tauri-locked revision, using the repository's canonical make sync-tauri-server target. This keeps Qt and Tauri release artifacts on the same server revision.

Verification

$ python3 scripts/check_tauri_server.py 0.14.0b4.dev-cb6c240
ActivityWatch release: 0.14.0b4.dev-cb6c240
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

Repairs failed runs 33886946064 and 33887064744.

Git-Session-Id: e6dfe367-2e85-5f00-915c-30dfa695d67c
@greptile-apps

greptile-apps Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

This PR restores release consistency by moving the top-level aw-server-rust submodule to the exact revision already pinned by Tauri.

  • Aligns Qt and Tauri artifacts on aw-server-rust revision d2e7b803d6d7.
  • Satisfies the exact-revision release invariant introduced after prior server-lock mismatches.
  • Changes no source code, build logic, or component configuration beyond the submodule pointer.

Confidence Score: 5/5

The PR appears safe to merge because it restores the required exact revision alignment between the Qt server submodule and Tauri lock without introducing a supported-contract failure.

The sole change synchronizes the top-level server gitlink with the revision reported by the Tauri lock verification, and no concrete behavioral, build, security, or repository-rule issue remains.

Important Files Changed

Filename Overview
aw-server-rust Repoints the Rust server submodule from df9c4fab to the Tauri-locked d2e7b803 revision, restoring release artifact consistency.

Reviews (1): Last reviewed commit: "fix(release): sync server submodule with..." | Re-trigger Greptile

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

Greptile is clear at 5/5. The release build matrix is still running, so no merge or code change is appropriate yet; project monitoring will handle any concrete CI failure or the eventual merge gate.

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