Skip to content

fix(mac-crafter): Work around broken consecutive shell integration builds #8107

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
mgallien merged 1 commit into from
Apr 4, 2025
Merged

fix(mac-crafter): Work around broken consecutive shell integration builds #8107

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
20 changes: 16 additions & 4 deletions admin/osx/mac-crafter/Sources/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,21 +208,33 @@ struct Build: ParsableCommand {
)
}

print("Crafting \(appName) Desktop Client...")

let allOptionsString = craftOptions.map({ "--options \"\($0)\"" }).joined(separator: " ")

let clientBuildDir = "\(buildPath)/\(craftTarget)/build/\(craftBlueprintName)"
print("Crafting \(appName) Desktop Client...")
if fullRebuild {
do {
try fm.removeItem(atPath: clientBuildDir)
} catch let error {
print("WARNING! Error removing build directory: \(error)")
}
} else {
// HACK: When building the client we often run into issues with the shell integration
// component -- particularly the FileProviderExt part. So we wipe out the build
// artifacts so this part gets build first. Let's first check if we have an existing
// build in the folder we expect
let shellIntegrationDir = "\(clientBuildDir)/work/build/shell_integration/MacOSX"
if fm.fileExists(atPath: shellIntegrationDir) {
print("Removing existing shell integration build artifacts...")
do {
try fm.removeItem(atPath: shellIntegrationDir)
} catch let error {
print("WARNING! Error removing shell integration build directory: \(error)")
}
}
}

let buildMode = fullRebuild ? "-i" : disableAppBundle ? "compile" : "--compile --install"
let offlineMode = offline ? "--offline" : ""
let allOptionsString = craftOptions.map({ "--options \"\($0)\"" }).joined(separator: " ")
guard shell(
"\(craftCommand) --buildtype \(buildType) \(buildMode) \(offlineMode) \(allOptionsString) \(craftBlueprintName)"
) == 0 else {
Expand Down