Skip to content

Comments

feat: add aw-tauri support alongside aw-qt#1208

Closed
TimeToBuildBob wants to merge 11 commits intoActivityWatch:masterfrom
TimeToBuildBob:feat/aw-tauri-support
Closed

feat: add aw-tauri support alongside aw-qt#1208
TimeToBuildBob wants to merge 11 commits intoActivityWatch:masterfrom
TimeToBuildBob:feat/aw-tauri-support

Conversation

@TimeToBuildBob
Copy link
Contributor

@TimeToBuildBob TimeToBuildBob commented Feb 20, 2026

Summary

This is a clean takeover of #1163 (originally by @0xbrayo), addressing all outstanding review comments. The goal is to keep aw-qt builds intact while adding aw-tauri as a parallel build target with its own CI workflow.

Changes from original PR

All changes from #1163 are included, plus the following fixes addressing review feedback:

Review comments addressed

ErikBjare's inline comment on scripts/package/aw-tauri.iss:

  • Renamed app from "ActivityWatch" to "ActivityWatch Tauri" to avoid collision with aw-qt installer (they shared DefaultDirName={autopf}\ActivityWatch)
  • Uncommented and set AppVerName to show the proper name in Windows installer
  • Removed the -tauri suffix from MyAppVersion (now redundant since the app name includes "Tauri")

Makefile ICON conditional:

  • Made aw-qt/media/logo/logo.icns dependency conditional on TAURI_BUILD. When building with Tauri, the aw-qt icon build step is skipped (Tauri uses its own bundled icons).

move-to-aw-modules.sh rsync flags inconsistency:

  • Both Wayland and X11 paths now use rsync -a (archive) for consistent behavior
  • Extracted shared --exclude flags into a $EXCLUDES variable to reduce duplication
  • aw-sync copy is now unconditional (applies to both paths)

README.txt typos:

  • "copy it a permanent folder" → "copy it to a permanent folder"
  • Capitalized "appimage" → "AppImage", "linux" → "Linux", "rpm"/"deb" → "RPM"/"DEB"

build-tauri.yml and build.yml typo:

  • Fixed "Wether" → "Whether" in both workflow files

What this PR keeps from #1163

  • Separate build-tauri.yml CI workflow for aw-tauri builds (doesn't affect existing aw-qt build.yml)
  • build.yml updated runner versions (ubuntu-24.04, macOS-13, macos-latest, windows-latest)
  • aw-tauri and awatcher submodules
  • scripts/package/build_app_tauri.sh for macOS app bundle creation
  • scripts/package/aw-tauri.iss for Windows installer (with collision fix)
  • scripts/package/move-to-aw-modules.sh for Linux module installation
  • Makefile conditional for TAURI_BUILD

Test plan

  • Verify aw-qt CI (build.yml) still passes without modification
  • Verify aw-tauri CI (build-tauri.yml) builds successfully on all platforms
  • Verify Windows installer names don't conflict (aw-qt installs to ActivityWatch, aw-tauri installs to ActivityWatch Tauri)

Important

Adds support for building ActivityWatch with Tauri alongside Qt, including new CI workflows and packaging scripts.

  • Behavior:
    • Adds aw-tauri as a parallel build target to aw-qt with its own CI workflow in build-tauri.yml.
    • Ensures aw-qt builds remain intact.
    • Windows installer for aw-tauri named "ActivityWatch Tauri" to avoid collision with aw-qt.
  • CI/CD:
    • Introduces build-tauri.yml for Tauri builds, supporting multiple OS and Python versions.
    • Updates build.yml to include new runner versions and corrects typos.
  • Makefile:
    • Conditional inclusion of aw-tauri and awatcher submodules based on TAURI_BUILD and OS.
    • Adjusts PACKAGEABLES to exclude certain modules when TAURI_BUILD is true.
  • Scripts:
    • Adds build_app_tauri.sh for macOS app bundle creation.
    • Adds aw-tauri.iss for Windows installer.
    • Updates move-to-aw-modules.sh for module management.
  • Misc:
    • Fixes typos in README.txt and workflow files.
    • Updates submodule references in .gitmodules.

This description was created by Ellipsis for fcd408f. You can customize this summary. It will automatically update as commits are pushed.

0xbrayo and others added 11 commits August 4, 2025 21:18
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
- aw-tauri.iss: rename app to "ActivityWatch Tauri" to avoid collision
  with aw-qt installer (same DefaultDirName, same AppName previously)
- aw-tauri.iss: uncomment AppVerName, use plain version without "-tauri" suffix
- Makefile: make aw-qt icon dependency conditional on TAURI_BUILD so
  the aw-qt icon build step is skipped when building with Tauri
- move-to-aw-modules.sh: use consistent rsync -a flags in both Wayland
  and X11 paths; deduplicate excludes into a shared variable
- README.txt: fix typos ("copy it to", "AppImage", "Linux" capitalized)
- build-tauri.yml, build.yml: fix typo "Wether" → "Whether"
@TimeToBuildBob
Copy link
Contributor Author

@greptileai review

Copy link

@ellipsis-dev ellipsis-dev bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Important

Looks good to me! 👍

Reviewed everything up to fcd408f in 11 seconds. Click for details.
  • Reviewed 902 lines of code in 17 files
  • Skipped 0 files when reviewing.
  • Skipped posting 0 draft comments. View those below.
  • Modify your settings and rules to customize what types of comments Ellipsis leaves. And don't forget to react with 👍 or 👎 to teach Ellipsis.

Workflow ID: wflow_CuHhEbdSN997gB7U

You can customize Ellipsis by changing your verbosity settings, reacting with 👍 or 👎, replying to comments, or adding code review rules.

@TimeToBuildBob
Copy link
Contributor Author

Superseded by #1209 which has cleaner commits (3 focused commits vs this PR's incremental approach). All review comments from #1163 are addressed there.

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