From af427920ced357739e65fd4f33c4ac2ecf67963c Mon Sep 17 00:00:00 2001 From: Mike Maxim Date: Thu, 5 Feb 2026 14:23:41 -0500 Subject: [PATCH] allow setting a single arch in darwin build --- packaging/build_darwin.sh | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/packaging/build_darwin.sh b/packaging/build_darwin.sh index 6d727d4951ad..f68fcf67c335 100755 --- a/packaging/build_darwin.sh +++ b/packaging/build_darwin.sh @@ -3,10 +3,25 @@ gopath=${GOPATH:-} client_dir="$gopath/src/github.com/keybase/client" -"$client_dir/packaging/slack/send.sh" "Starting darwin build" -ARCH="amd64" PLATFORM="darwin" "$client_dir/packaging/prerelease/pull_build.sh" -# 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. -"$client_dir/packaging/slack/send.sh" "Starting darwin-arm64 build" -ARCH="arm64" PLATFORM="darwin-arm64" "$client_dir/packaging/prerelease/pull_build.sh" +if [[ -n "${ARCH:-}" ]]; then + # If ARCH is specified, only build that one + if [[ "$ARCH" == "amd64" ]]; then + "$client_dir/packaging/slack/send.sh" "Starting darwin build" + ARCH="amd64" PLATFORM="darwin" "$client_dir/packaging/prerelease/pull_build.sh" + elif [[ "$ARCH" == "arm64" ]]; then + "$client_dir/packaging/slack/send.sh" "Starting darwin-arm64 build" + ARCH="arm64" PLATFORM="darwin-arm64" "$client_dir/packaging/prerelease/pull_build.sh" + else + echo "Unknown ARCH: $ARCH (expected amd64 or arm64)" + exit 1 + fi +else + # Build both architectures + "$client_dir/packaging/slack/send.sh" "Starting darwin build" + ARCH="amd64" PLATFORM="darwin" "$client_dir/packaging/prerelease/pull_build.sh" + # 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. + "$client_dir/packaging/slack/send.sh" "Starting darwin-arm64 build" + ARCH="arm64" PLATFORM="darwin-arm64" "$client_dir/packaging/prerelease/pull_build.sh" +fi