build(deps): bump aw-watcher-window past #137 (research edition ready) - #1
Merged
Conversation
…tyWatch#1393) Unify all asset filenames to: activitywatch[-tauri][-research]-<version>-<os>-<arch>[-setup].<ext> Previously research-edition assets mixed three conventions (edition token before the version in zips, after the arch in dmg/deb/rpm, and one AppImage without a version), and said 'research' twice since the tag already carries a -research suffix. - Strip the -research tag suffix from the version part of filenames (and from the Debian control version, where it would parse as a revision); the edition lives in its own token after the product name. - Rename the edition token from '-research-edition' to '-research'. - Move edition naming for AppImage/deb into the package scripts, dropping the post-hoc mv hacks in the workflow. - Document why the Qt AppImage filename is unversioned (stable releases/latest/download URL).
… release line (ActivityWatch#1391) * ci(activitywatch): verify aw-server-rust submodule matches release tag in build-tauri Adds a fast-fail step in build-tauri that reads the bundled aw-server version from aw-server-rust/aw-server/Cargo.toml and compares the major.minor prefix against the AW release tag. If the submodule is pinned to an older release line, the build fails immediately rather than producing a 30-min Tauri bundle with the wrong backend (the Windows 0.14 release shipped with aw-server v0.13.1 due to this). Fixes ActivityWatch#1380 * ci(build-tauri): add missing aw-server-rust version guard The version-freshness check landed in build-qt but not build-tauri — the job that actually shipped the mismatched bundle in ActivityWatch#1380. Add the same fail-fast step to build-tauri so all five Tauri matrix jobs are guarded, not just the independent Qt build. --------- Co-authored-by: Bob <bob@bob.local>
ActivityWatch#1397) * feat(research): inject APP_TO_CATEGORY map into research config at build time Adds APP_CATEGORY_MAP (72 entries, faithfully derived from Matthias Lehner's APP_TO_CATEGORY dict) to the CI patch script. When [aw-watcher-window.research_app_category_map] is present in the submodule's config.py (requires ActivityWatch/aw-watcher-window#136 in the pin), the patch script now injects the app map alongside the existing URL/title category map. Non-browser apps are replaced by a broad study category (e.g. 'Microsoft Outlook' → 'Email', 'Spotify' → 'Music & Audio') instead of keeping the raw app name. Unmapped apps become 'Excluded'. The injection is non-fatal when the section is absent so this commit stays compatible with older submodule pins before ActivityWatch#136 merges. * fix(tests): unpack tuple return from patch_config in test assertions * fix(research): bump aw-watcher-window past ActivityWatch#136 and fail closed on stale pins The submodule was pinned at 624823a7, exactly one commit behind the merged APP_TO_CATEGORY support (a297914c, ActivityWatch#136). That pin has no [aw-watcher-window.research_app_category_map] section, and the injection step treated a missing section as non-fatal — so the build went green, printed a note into the CI log, and produced an artifact where non-browser apps keep their raw names. That is the exact symptom the map exists to fix. - bump aw-watcher-window 624823a7 -> a297914c (merged ActivityWatch#136) - patch_config() now raises when the app-map section is absent - regression test for the pre-ActivityWatch#136 pin Verified by symptom against both pins' real config.py: new pin injects 570 patterns + 72 app entries (exit 0); old pin aborts (exit 1).
…r the flag rewrite aw-watcher-window#137 moved the research knobs out of `default_config` into a separate `research_defaults` template, so they stop being persisted into every fresh install's config file. That is the right fix, but it removes both TOML table headers the Research Edition patch script anchors on. Two defects follow. 1. Injection breaks on the next submodule bump. `patch_config()` requires exactly one `[aw-watcher-window.research_category_map]` and one `[aw-watcher-window.research_app_category_map]` header. Neither exists past ActivityWatch#137, so the script aborts and the Research Edition build fails. The pin is currently a297914 (the ActivityWatch#136 merge), where both headers still exist -- so the build works today and breaks the moment anything, including a dependabot submodule bump, moves it forward. The fail-closed message would also misdiagnose it as 'submodule predates ActivityWatch#136' when the real cause is the opposite. 2. The flag rewrite could silently disable the Research Edition. ActivityWatch#137 documents the release-time rewrite in a comment containing the literal text `sed -i 's/^research_enabled = false$/research_enabled = true/'`, and that comment sits *above* the real flag. The unanchored `text.replace(..., 1)` therefore patches the comment and leaves `research_enabled = false`, producing a green build with research disabled and no error anywhere. Both layouts are now handled: post-ActivityWatch#137 the maps are injected into `research_defaults` with unprefixed headers (that template is parsed standalone and merged into the section key by key, so a prefixed header would create a nested key nothing reads); pre-ActivityWatch#137 the existing prefixed headers are used. The flag rewrite is line-anchored via regex, matching the contract ActivityWatch#137's own comment documents, and refuses to guess if it finds anything other than exactly one match. The pre-ActivityWatch#136 guard now keys on the runtime lookup `config.get("research_app_category_map"` rather than a table header, so it tests the capability that actually matters and survives further reshuffling of the config templates. Verified against both real config.py revisions: 570 category patterns and 72 app entries inject correctly, and the output parses as Python and as TOML in each.
Advance the aw-watcher-window submodule from a297914 to a7690ac, picking up ActivityWatch/aw-watcher-window#137 (fix(config): keep research options out of the first-run config). This is the prerequisite for the post-ActivityWatch#137 config layout the patch_research_edition_config.py script (c328757, in fix/re-patch- config-shape) was rewritten to handle. Without this bump, the Research Edition build would still pin to the pre-ActivityWatch#137 layout and patch in category maps that no longer exist after ActivityWatch#137 moved research knobs into a separate research_defaults template. Verified: scripts/tests/test_patch_research_edition_config.py (7 tests, all pass); live patch run against aw-watcher-window/aw_watcher_window/ config.py injects 570 unique URL/title patterns across 17 categories and 72 app-name entries, and flips research_enabled from false to true. Refs: ActivityWatch/aw-watcher-window#137, ErikBjare/bob#599, tasks/aw-research-edition-study-ops-goal-arc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Advance the aw-watcher-window submodule from a297914 (ActivityWatch/aw-watcher-window#136) to a7690ac (ActivityWatch/aw-watcher-window#137).
ActivityWatch/aw-watcher-window#137 is the dependency that the patch_research_edition_config.py rewrite (c328757, on fix/re-patch-config-shape) was written to handle. Without this bump, the Research Edition CI build (edition=research) would ship a signed installer with the privacy filter off — exactly the failure mode c328757 exists to prevent — because the script anchors on [aw-watcher-window.research_*] table headers that no longer exist in default_config past ActivityWatch#137.
Changes:
This branch stacks on fix/re-patch-config-shape, which holds c328757 (the script rewrite). Land that script commit first, or accept both into master together. Branching from fix/re-patch-config-shape so this PR includes the script-fix commit in its git log --first-parent history makes the dependency explicit; rebasing onto plain master regresses the patch script to the pre-ActivityWatch#137 layout and this bump breaks the build.
Verification:
-> 570 unique URL/title patterns across 17 categories
-> 72 app-name entries
-> research_enabled flipped to true
Refs: