From cc86c5ca1f438245b69dcc8288aabe1773c66a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Mon, 13 Apr 2026 22:07:01 +0200
Subject: [PATCH 1/2] ci: add -tauri suffix to Tauri build release assets

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.
---
 .github/workflows/build-tauri.yml |  2 +-
 scripts/package/package-all.sh    | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-tauri.yml b/.github/workflows/build-tauri.yml
index 6350663ff..fb09b9597 100644
--- a/.github/workflows/build-tauri.yml
+++ b/.github/workflows/build-tauri.yml
@@ -164,7 +164,7 @@ jobs:
 
             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
         env:
           APPLE_EMAIL: ${{ secrets.APPLE_EMAIL }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
diff --git a/scripts/package/package-all.sh b/scripts/package/package-all.sh
index ae286c94a..52c19f2d1 100755
--- a/scripts/package/package-all.sh
+++ b/scripts/package/package-all.sh
@@ -41,7 +41,12 @@ function get_arch() {
 platform=$(get_platform)
 version=$(get_version)
 arch=$(get_arch)
-echo "Platform: $platform, arch: $arch, version: $version"
+# Suffix to distinguish Tauri builds from aw-qt builds in release assets
+build_suffix=""
+if [[ $TAURI_BUILD == "true" ]]; then
+    build_suffix="-tauri"
+fi
+echo "Platform: $platform, arch: $arch, version: $version, tauri: ${TAURI_BUILD:-false}"
 
 # For Tauri Linux builds, include helper scripts and README
 if [[ $platform == "linux" && $TAURI_BUILD == "true" ]]; then
@@ -51,7 +56,7 @@ fi
 function build_zip() {
     echo "Zipping executables..."
     pushd dist;
-    filename="activitywatch-${version}-${platform}-${arch}.zip"
+    filename="activitywatch${build_suffix}-${version}-${platform}-${arch}.zip"
     echo "Name of package will be: $filename"
 
     if [[ $platform == "windows"* ]]; then
@@ -64,7 +69,7 @@ function build_zip() {
 }
 
 function build_setup() {
-    filename="activitywatch-${version}-${platform}-${arch}-setup.exe"
+    filename="activitywatch${build_suffix}-${version}-${platform}-${arch}-setup.exe"
     echo "Name of package will be: $filename"
 
     innosetupdir="/c/Program Files (x86)/Inno Setup 6"

From 07b80db1e2180ca23ac6fc293a0d2b1c9df291a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Tue, 14 Apr 2026 18:26:18 +0200
Subject: [PATCH 2/2] ci: use dynamic arch in DMG filename instead of hardcoded
 x86_64

macOS runners are now arm64, so the DMG was mislabeled. Use uname -m
to get the actual architecture, consistent with package-all.sh.
---
 .github/workflows/build-tauri.yml | 2 +-
 .github/workflows/build.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-tauri.yml b/.github/workflows/build-tauri.yml
index fb09b9597..41f9c532f 100644
--- a/.github/workflows/build-tauri.yml
+++ b/.github/workflows/build-tauri.yml
@@ -164,7 +164,7 @@ jobs:
 
             make dist/notarize
           fi
-          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
         env:
           APPLE_EMAIL: ${{ secrets.APPLE_EMAIL }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7701d249..45078c1c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -178,7 +178,7 @@ jobs:
           # Notarize
           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-${VERSION_TAG:-$(scripts/package/getversion.sh)}-macos-$(uname -m).dmg
       env:
         APPLE_EMAIL: ${{ secrets.APPLE_EMAIL }}
         APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}