Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-tauri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-$(uname -m).dmg
env:
APPLE_EMAIL: ${{ secrets.APPLE_EMAIL }}
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
11 changes: 8 additions & 3 deletions scripts/package/package-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down
Loading