vrr/openclaw
2
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-13 19:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

fix(mac): preserve Xcode preflight failure diagnostics (#121170)

Browse source
This commit is contained in:
Leon-SK668 2026-08-13 14:17:32 +08:00 • committed by GitHub
parent 3f4f57a021
commit cc2ed816be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/lib/swift-toolchain.sh
View file

@ -4,7 +4,9 @@ REQUIRED_SWIFT_TOOLS_MAJOR=6
REQUIRED_SWIFT_TOOLS_MINOR=2
require_swift_toolchain() {
if ! xcrun xcodebuild -version >/dev/null 2>&1; then
local xcodebuild_version
if ! xcodebuild_version="$(xcrun xcodebuild -version 2>&1)"; then
printf '%s\n' "$xcodebuild_version" >&2
echo "ERROR: OpenClaw macOS app packaging requires a full Xcode developer directory." >&2
echo " Command Line Tools do not include the required SwiftUI macro plugins." >&2
echo " Use: sudo xcode-select -s /Applications/Xcode.app/Contents/Developer" >&2

29
test/scripts/package-mac-app.test.ts
View file

@ -62,6 +62,7 @@ function runSwiftToolchainHarness(options: {
swiftVersion: string;
selectedDeveloperDir: "command-line-tools" | "custom-xcode" | "invalid" | "xcode";
developerDirOverride?: "custom-xcode" | "invalid" | "xcode";
xcodebuildFailure?: string;
}) {
const root = tempDirs.make("openclaw-package-swift-root-");
const toolsDir = path.join(root, "tools");
@ -84,9 +85,14 @@ function runSwiftToolchainHarness(options: {
mkdirSync(path.dirname(xcodebuild), { recursive: true });
writeFileSync(
xcodebuild,
["#!/usr/bin/env bash", '[[ "$*" == "-version" ]] || exit 2', "echo 'Xcode 26.0'", ""].join(
"\n",
),
[
"#!/usr/bin/env bash",
'[[ "$*" == "-version" ]] || exit 2',
...(options.xcodebuildFailure
? [`printf '%s\\n' ${JSON.stringify(options.xcodebuildFailure)} >&2`, "exit 1"]
: ["echo 'Xcode 26.0'"]),
"",
].join("\n"),
"utf8",
);
chmodSync(xcodebuild, 0o755);
@ -877,6 +883,23 @@ describe("package-mac-app plist stamping", () => {
expect(result.stderr).toContain("requires a full Xcode developer directory");
});
it("preserves the native Xcode failure before generic selection guidance", () => {
const diagnostic = "xcodebuild: error: SDK metadata is unavailable";
const result = runSwiftToolchainHarness({
swiftVersion: "6.2.1",
selectedDeveloperDir: "xcode",
xcodebuildFailure: diagnostic,
});
expect(result.status).toBe(1);
const diagnosticIndex = result.stderr.indexOf(diagnostic);
const guidanceIndex = result.stderr.indexOf(
"ERROR: OpenClaw macOS app packaging requires a full Xcode developer directory",
);
expect(diagnosticIndex).toBeGreaterThanOrEqual(0);
expect(guidanceIndex).toBeGreaterThan(diagnosticIndex);
});
it("runs Sparkle build metadata derivation from the repository root", () => {
const helperBlock = getSparkleBuildHelperBlock();
const tempRoot = tempDirs.make("openclaw-package-sparkle-root-");