ci: add -tauri suffix to Tauri build release assets#1262
ci: add -tauri suffix to Tauri build release assets#1262
Conversation
Both build.yml and build-tauri.yml upload to the same GitHub release with identical filenames, causing one to silently overwrite the other. Add "-tauri" to Tauri build filenames (zip, dmg, setup.exe) so both aw-qt and Tauri assets coexist on the same release.
Greptile SummaryThis PR disambiguates release asset filenames by adding a Confidence Score: 5/5Safe to merge; the suffix logic is correct and aw-qt builds are unaffected. The one comment is a minor improvement opportunity, not a blocker. All remaining findings are P2 style/improvement suggestions. The core fix (preventing filename collisions via
Important Files Changed
Flowchart%%{init: {'theme': 'neutral'}}%%
flowchart TD
A[package-all.sh called] --> B{TAURI_BUILD == 'true'?}
B -- Yes --> C[build_suffix = '-tauri']
B -- No --> D[build_suffix = '']
C --> E[build_zip: activitywatch-tauri-VERSION-OS-ARCH.zip]
D --> F[build_zip: activitywatch-VERSION-OS-ARCH.zip]
E --> G{platform == windows?}
F --> H{platform == windows?}
G -- Yes --> I[build_setup: activitywatch-tauri-VERSION-windows-ARCH-setup.exe]
H -- Yes --> J[build_setup: activitywatch-VERSION-windows-ARCH-setup.exe]
subgraph build-tauri.yml macOS step
K[make dist/ActivityWatch.dmg] --> L[mv to activitywatch-tauri-VERSION-macos-x86_64.dmg]
end
subgraph build.yml macOS step
M[make dist/ActivityWatch.dmg] --> N[mv to activitywatch-VERSION-macos-x86_64.dmg]
end
Reviews (1): Last reviewed commit: "ci: add -tauri suffix to Tauri build rel..." | Re-trigger Greptile |
.github/workflows/build-tauri.yml
Outdated
| make dist/notarize | ||
| fi | ||
| mv dist/ActivityWatch.dmg dist/activitywatch-${VERSION_TAG:-$(scripts/package/getversion.sh)}-macos-x86_64.dmg | ||
| mv dist/ActivityWatch.dmg dist/activitywatch-tauri-${VERSION_TAG:-$(scripts/package/getversion.sh)}-macos-x86_64.dmg |
There was a problem hiding this comment.
DMG arch hardcoded to
x86_64 on ARM runner
The filename uses a literal x86_64 even though macos-latest on GitHub Actions now defaults to an M1/ARM64 runner. On an ARM Mac host, $(uname -m) returns arm64, so the DMG asset will be mislabeled. package-all.sh already derives the arch dynamically for the zip — the same approach should be used here.
| mv dist/ActivityWatch.dmg dist/activitywatch-tauri-${VERSION_TAG:-$(scripts/package/getversion.sh)}-macos-x86_64.dmg | |
| mv dist/ActivityWatch.dmg dist/activitywatch-tauri-${VERSION_TAG:-$(scripts/package/getversion.sh)}-macos-$(uname -m).dmg |
The same pre-existing issue exists in build.yml line 181 (activitywatch-${VERSION_TAG:-...}-macos-x86_64.dmg), but this PR is a good opportunity to fix it for the Tauri variant at least.
macOS runners are now arm64, so the DMG was mislabeled. Use uname -m to get the actual architecture, consistent with package-all.sh.
Summary
build.ymlandbuild-tauri.ymlupload to the same GitHub release with identical filenames, causing silent overwrites-taurisuffix to Tauri build filenames so both aw-qt and Tauri assets coexistBefore:
activitywatch-v0.14.0b1-linux-x86_64.zip(ambiguous)After:
activitywatch-tauri-v0.14.0b1-linux-x86_64.zip(Tauri) vsactivitywatch-v0.14.0b1-linux-x86_64.zip(aw-qt)Affects zip, dmg, and Windows setup.exe. AppImage and deb are aw-qt only, unchanged.