Skip to content

fix(package): resolve edition-suffixed Inno Setup output name - #1436

Merged
ErikBjare merged 1 commit into
masterfrom
fix/research-setup-exe-name
Sep 8, 2026
Merged

fix(package): resolve edition-suffixed Inno Setup output name#1436
ErikBjare merged 1 commit into
masterfrom
fix/research-setup-exe-name

Conversation

@ErikBjare

Copy link
Copy Markdown
Member

The v0.14.0b5-research tag build (run 34208437212) failed on exactly the two Windows jobs: #1434's research patcher renames the Inno Setup OutputBaseFilename to activitywatch-research-setup / activitywatch-research-tauri-setup (which worked — the log shows the compiled exe), but package-all.sh still ran mv dist/activitywatch-setup.exe …mv: cannot statmake package Error 1 on both Qt and Tauri. All non-Windows jobs passed.

Fix: glob the single produced dist/activitywatch*-setup.exe (dist/ is fresh at this point) with a fail-loud assertion that exactly one exists, then move it to the final $filename. Works for both editions and stays correct if the patcher's naming evolves.

Escaped the 6.2 research PR-CI leg because that job doesn't exercise Windows packaging — noting that as a follow-up candidate rather than expanding this PR.

The Research Edition patcher (#1434) rewrites OutputBaseFilename in both
.iss files to activitywatch-research[-tauri]-setup, but package-all.sh
still moved the hardcoded standard name — failing both Windows jobs on
the v0.14.0b5-research tag build (mv: cannot stat). Glob the single
produced setup exe instead, failing loudly if the count is ever not 1.
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 8, 2026

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review Completed 2026-09-08T09:48:29.393805Z 396f4d2 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@greptile-apps

greptile-apps Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

This PR fixes Windows packaging for edition-suffixed Inno Setup outputs.

  • Resolves the generated installer through the edition-compatible dist/activitywatch*-setup.exe pattern.
  • Requires exactly one regular matching artifact before assigning the final versioned package name.
  • Preserves the existing Qt and Tauri packaging paths while supporting standard and Research Edition output names.

Confidence Score: 5/5

The PR appears safe to merge and correctly handles standard and edition-suffixed Windows installer outputs.

The packaging flow guarantees a fresh output directory, produces one installer, and now explicitly rejects missing or ambiguous matches before renaming the artifact.

Important Files Changed

Filename Overview
scripts/package/package-all.sh Replaces the hardcoded Inno Setup output path with a guarded, edition-compatible artifact lookup.

Reviews (1): Last reviewed commit: "fix(package): resolve edition-suffixed I..." | Re-trigger Greptile

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.

1 participant