Skip to content

build: skip unchanged diff sidecar builds #13212

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teamleaderleo merged 6 commits into from
Sep 20, 2026
Merged

build: skip unchanged diff sidecar builds #13212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb5b7f7
build: skip unchanged diff sidecar builds
teamleaderleo Sep 19, 2026
c72c034
build: harden diff sidecar stamp writes
teamleaderleo Sep 19, 2026
0a824a1
fix: retire stale diff-sidecar configuration stamps
teamleaderleo Sep 19, 2026
97386d6
Merge main into perf/upstream-diff-sidecar-sweep
teamleaderleo Sep 20, 2026
dd43d95
Merge branch 'main' into perf/upstream-diff-sidecar-sweep
teamleaderleo Sep 20, 2026
fcb2436
Merge main to repair missing CmuxFoundation imports in CI
teamleaderleo Sep 20, 2026
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
5 changes: 2 additions & 3 deletions cmux.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12610,7 +12610,6 @@
};
D1FF50000000000000000001 /* Build Diff Sidecar */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -12635,11 +12634,11 @@
);
outputPaths = (
"$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/bin/cmux-diff-sidecar",
"$(TARGET_TEMP_DIR)/cmux-diff-sidecar.arch-$(ARCHS).min-$(MACOSX_DEPLOYMENT_TARGET).stamp",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/scripts/build-diff-sidecar.sh\"\n";
};
shellScript = "rm -f \"${TARGET_TEMP_DIR}\"/cmux-diff-sidecar.arch-*.min-*.stamp\nCMUX_DIFF_SIDECAR_ARCHS=\"${ARCHS}\" CMUX_DIFF_SIDECAR_MIN_MACOS=\"${MACOSX_DEPLOYMENT_TARGET}\" CMUX_DIFF_SIDECAR_STAMP=\"${TARGET_TEMP_DIR}/cmux-diff-sidecar.arch-${ARCHS}.min-${MACOSX_DEPLOYMENT_TARGET}.stamp\" \"${SRCROOT}/scripts/build-diff-sidecar.sh\"\n"; };
A9E030000000000000000009 /* Reject Bundled Provider Binaries */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down
19 changes: 19 additions & 0 deletions scripts/build-diff-sidecar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,22 @@ chmod +x "$destination"
if [[ "${CODE_SIGNING_ALLOWED:-YES}" != "NO" && -n "${EXPANDED_CODE_SIGN_IDENTITY:-}" ]]; then
codesign --force --sign "$EXPANDED_CODE_SIGN_IDENTITY" "$destination" >/dev/null
fi

# Xcode's dependency-analysis output is keyed by the normal architecture and
# deployment-target settings. The Xcode phase pins the script overrides to
# those same build settings before invoking this script. The stamp is
# intentionally optional so direct script callers retain override support.
if [[ -n "${CMUX_DIFF_SIDECAR_STAMP:-}" ]]; then
stamp_tmp="$(mktemp "${CMUX_DIFF_SIDECAR_STAMP}.tmp.XXXXXX")"
cleanup_stamp_tmp() {
[[ -e "$stamp_tmp" ]] && rm -f "$stamp_tmp"
}
trap cleanup_stamp_tmp EXIT
{
printf 'requested_archs=%s\n' "$requested_archs"
printf 'min_macos=%s\n' "${CMUX_DIFF_SIDECAR_MIN_MACOS:-14.0}"
shasum -a 256 "$destination"
} > "$stamp_tmp"
mv -f "$stamp_tmp" "$CMUX_DIFF_SIDECAR_STAMP"
trap - EXIT
fi
Loading