feat: add aw-tauri support alongside aw-qt#1208
Closed
TimeToBuildBob wants to merge 11 commits intoActivityWatch:masterfrom
Closed
feat: add aw-tauri support alongside aw-qt#1208TimeToBuildBob wants to merge 11 commits intoActivityWatch:masterfrom
TimeToBuildBob wants to merge 11 commits intoActivityWatch:masterfrom
Conversation
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"
Contributor
Author
|
@greptileai review |
There was a problem hiding this comment.
Important
Looks good to me! 👍
Reviewed everything up to fcd408f in 11 seconds. Click for details.
- Reviewed
902lines of code in17files - Skipped
0files when reviewing. - Skipped posting
0draft 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 by changing your verbosity settings, reacting with 👍 or 👎, replying to comments, or adding code review rules.
Contributor
Author
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
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.
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:"ActivityWatch"to"ActivityWatch Tauri"to avoid collision with aw-qt installer (they sharedDefaultDirName={autopf}\ActivityWatch)AppVerNameto show the proper name in Windows installer-taurisuffix fromMyAppVersion(now redundant since the app name includes "Tauri")Makefile ICON conditional:
aw-qt/media/logo/logo.icnsdependency conditional onTAURI_BUILD. When building with Tauri, the aw-qt icon build step is skipped (Tauri uses its own bundled icons).move-to-aw-modules.shrsync flags inconsistency:rsync -a(archive) for consistent behavior--excludeflags into a$EXCLUDESvariable to reduce duplicationaw-synccopy is now unconditional (applies to both paths)README.txt typos:
build-tauri.ymlandbuild.ymltypo:What this PR keeps from #1163
build-tauri.ymlCI workflow for aw-tauri builds (doesn't affect existing aw-qtbuild.yml)build.ymlupdated runner versions (ubuntu-24.04, macOS-13, macos-latest, windows-latest)aw-tauriandawatchersubmodulesscripts/package/build_app_tauri.shfor macOS app bundle creationscripts/package/aw-tauri.issfor Windows installer (with collision fix)scripts/package/move-to-aw-modules.shfor Linux module installationTAURI_BUILDTest plan
build.yml) still passes without modificationbuild-tauri.yml) builds successfully on all platformsActivityWatch, aw-tauri installs toActivityWatch Tauri)Important
Adds support for building ActivityWatch with Tauri alongside Qt, including new CI workflows and packaging scripts.
aw-taurias a parallel build target toaw-qtwith its own CI workflow inbuild-tauri.yml.aw-qtbuilds remain intact.aw-taurinamed "ActivityWatch Tauri" to avoid collision withaw-qt.build-tauri.ymlfor Tauri builds, supporting multiple OS and Python versions.build.ymlto include new runner versions and corrects typos.aw-tauriandawatchersubmodules based onTAURI_BUILDand OS.PACKAGEABLESto exclude certain modules whenTAURI_BUILDis true.build_app_tauri.shfor macOS app bundle creation.aw-tauri.issfor Windows installer.move-to-aw-modules.shfor module management.README.txtand workflow files..gitmodules.This description was created by
for fcd408f. You can customize this summary. It will automatically update as commits are pushed.