Skip to content

clean between darwin archs #28866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmaxim merged 1 commit into from
Feb 5, 2026
Merged

clean between darwin archs #28866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions packaging/build_darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ else
# Build both architectures
"$client_dir/packaging/slack/send.sh" "Starting darwin build"
ARCH="amd64" PLATFORM="darwin" "$client_dir/packaging/prerelease/pull_build.sh"

# Clean repo between arch builds

Copilot AI Feb 5, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 'git clean -fd' command will forcefully delete all untracked files and directories. While this is likely the intended behavior to ensure a clean state between architecture builds, it could potentially delete important untracked files if the script is run in an unexpected context.

Consider adding a comment explaining why these destructive operations are safe in this context (e.g., "Safe to force clean since check_status_and_pull.sh verifies repo is clean before first build, and we only need to remove build artifacts"). This helps prevent future maintainers from accidentally misusing this pattern in contexts where it might not be safe.

Suggested change
# Clean repo between arch builds
# Clean repo between arch builds. Safe to force reset/clean here because this
# script runs in the dedicated client repo and is only expected to remove build
# artifacts between the amd64 and arm64 builds (no user work should be untracked).

Copilot uses AI. Check for mistakes.
cd "$client_dir" && git reset --hard && git clean -fd

Copilot AI Feb 5, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commands on this line are chained together with && operators, which can make error tracking difficult and is inconsistent with the coding style used in other packaging scripts. Consider splitting this into separate lines for better readability and error handling:

cd "$client_dir"
git reset --hard
git clean -fd

This also helps identify which specific operation failed if there's an issue.

Suggested change
cd "$client_dir" && git reset --hard && git clean -fd
cd "$client_dir"
git reset --hard
git clean -fd

Copilot uses AI. Check for mistakes.

# NOTE: We build the arm64 version second to get a later timestamp, so it will
# be presented as a later version to your updater. This allows the one-time
# upgrading from the x86 build to the arm64 one.
Comment on lines +24 to 28

Copilot AI Feb 5, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the git reset and clean, the second architecture build will call check_status_and_pull.sh which performs a 'git pull --ff-only'. This means if new commits are pushed to the remote between the amd64 and arm64 builds, the two architectures will be built from different commits.

Consider setting NOPULL=1 for the second build to ensure both architectures are built from the same commit:

ARCH="arm64" PLATFORM="darwin-arm64" NOPULL=1 "$client_dir/packaging/prerelease/pull_build.sh"

This would make the builds more deterministic and ensure version consistency across architectures.

Copilot uses AI. Check for mistakes.
Expand Down