fix(build): build privately and swap generated/ after validation
Build into a per-run sibling directory and replace generated/ only after validation, with a lock around the swap, so a failed or parallel build never leaves generated/ partial. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
6d4ac56901
commit
cceb9e4839
5 files changed
+113
-9
No files matched your search
@@ -3,7 +3,11 @@ param([switch]$Summary)
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$root = Split-Path (Split-Path $PSScriptRoot -Parent) -Parent
|
||||
$shared = Join-Path $root 'shared'
|
||||
$output = Join-Path $root 'generated'
|
||||
$final = Join-Path $root 'generated'
|
||||
# Keep the name short: it lengthens every generated path, and Windows PowerShell 5.1 fails beyond 260 characters.
|
||||
$output = Join-Path $root ("generated.build-ps$PID-" + [Guid]::NewGuid().ToString('N').Substring(0, 6))
|
||||
# A trap covers the whole script scope, so every terminating error discards this run's tree.
|
||||
trap { Remove-Item -LiteralPath $output -Recurse -Force -ErrorAction SilentlyContinue; break }
|
||||
$sandboxSupported = [Environment]::OSVersion.Platform -eq [PlatformID]::Unix
|
||||
if ($sandboxSupported) {
|
||||
$kernel = (& uname -r 2>$null | Out-String).Trim()
|
||||
@@ -32,8 +36,16 @@ foreach ($entry in @(Import-Csv -LiteralPath $capabilityManifest -Delimiter ([ch
|
||||
$agentTools[$entry.role] = $entry.tools
|
||||
}
|
||||
|
||||
Remove-Item $output -Recurse -Force -ErrorAction SilentlyContinue
|
||||
New-Item $output -ItemType Directory -Force | Out-Null
|
||||
# Build into a private sibling directory and swap it into place only after validation, so a failed
|
||||
# or parallel build never leaves generated/ partial. Leftovers of crashed runs are removed here:
|
||||
# old trees always, build trees only when their PowerShell owner process has exited.
|
||||
# ponytail: Bash-owned leftovers are left to the Bash build, since PIDs are not comparable across shells.
|
||||
foreach ($leftover in @(Get-ChildItem -LiteralPath $root -Directory -Filter 'generated.*')) {
|
||||
if ($leftover.Name -like 'generated.old-*' -or ($leftover.Name -match '^generated\.build-ps(\d+)-' -and -not (Get-Process -Id ([int]$Matches[1]) -ErrorAction SilentlyContinue))) {
|
||||
Remove-Item -LiteralPath $leftover.FullName -Recurse -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
New-Item $output -ItemType Directory | Out-Null
|
||||
|
||||
function Copy-Directory($source, $destination) {
|
||||
New-Item $destination -ItemType Directory -Force | Out-Null
|
||||
@@ -220,5 +232,30 @@ $leftoverPlaceholders = @(Get-ChildItem $output -File -Recurse | ForEach-Object
|
||||
})
|
||||
if ($leftoverPlaceholders.Count) { throw "Unresolved template placeholders in: $($leftoverPlaceholders -join ', ')" }
|
||||
|
||||
$lockPath = Join-Path $root 'generated.lock'
|
||||
$lockDeadline = (Get-Date).AddSeconds(30)
|
||||
while ($true) {
|
||||
try { [System.IO.File]::Open($lockPath, [System.IO.FileMode]::CreateNew, [System.IO.FileAccess]::Write, [System.IO.FileShare]::None).Dispose(); break }
|
||||
catch [System.IO.IOException], [System.UnauthorizedAccessException] {
|
||||
if ((Get-Date) -gt $lockDeadline) { throw "Another build holds $lockPath; wait for it to finish, or remove the file if no build is running." }
|
||||
Start-Sleep -Milliseconds 200
|
||||
}
|
||||
}
|
||||
$retired = $null
|
||||
try {
|
||||
if (Test-Path -LiteralPath $final) {
|
||||
$retired = Join-Path $root ("generated.old-ps$PID-" + [Guid]::NewGuid().ToString('N').Substring(0, 6))
|
||||
[System.IO.Directory]::Move($final, $retired)
|
||||
}
|
||||
try { [System.IO.Directory]::Move($output, $final) }
|
||||
catch {
|
||||
if ($retired) { [System.IO.Directory]::Move($retired, $final); $retired = $null }
|
||||
throw
|
||||
}
|
||||
} finally {
|
||||
[System.IO.File]::Delete($lockPath)
|
||||
}
|
||||
if ($retired) { Remove-Item -LiteralPath $retired -Recurse -Force -ErrorAction SilentlyContinue }
|
||||
|
||||
if ($Summary) { Write-Output 'Build: PASS | 4 packages' } else { Write-Output 'PASS build: codex-powershell, claude-powershell, codex-bash, claude-bash' }
|
||||
exit 0
|
||||
@@ -10,7 +10,7 @@ done
|
||||
|
||||
root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)
|
||||
shared="$root/shared"
|
||||
output="$root/generated"
|
||||
final="$root/generated"
|
||||
sandbox_supported=false
|
||||
platform=$(uname -s 2>/dev/null || true)
|
||||
case "$platform" in
|
||||
@@ -66,7 +66,27 @@ if [ "$summary" = true ]; then
|
||||
else
|
||||
printf '%s\n' "$session_output"
|
||||
fi
|
||||
rm -rf -- "$output"
|
||||
# Build into a private sibling directory and swap it into place only after validation, so a failed
|
||||
# or parallel build never leaves generated/ partial. Leftovers of crashed runs are removed here:
|
||||
# old trees always, build trees only when their Bash owner process has exited.
|
||||
# ponytail: PowerShell-owned leftovers are left to the PowerShell build, since PIDs are not comparable across shells.
|
||||
for leftover in "$root"/generated.old-* "$root"/generated.build-sh*; do
|
||||
[ -d "$leftover" ] || continue
|
||||
if [[ "$leftover" == */generated.build-sh* ]]; then
|
||||
leftover_pid=${leftover##*/generated.build-sh}
|
||||
leftover_pid=${leftover_pid%%-*}
|
||||
! kill -0 "$leftover_pid" 2>/dev/null || continue
|
||||
fi
|
||||
rm -rf -- "$leftover"
|
||||
done
|
||||
lock="$root/generated.lock"
|
||||
locked=false
|
||||
retired=''
|
||||
output=''
|
||||
trap 'rm -rf -- ${output:+"$output"}; [ "$locked" != true ] || rm -f -- "$lock"' EXIT
|
||||
# Keep the name short: it lengthens every generated path, which matters on Windows.
|
||||
output=$(mktemp -d "$root/generated.build-sh$$-XXXXXX")
|
||||
chmod "$(printf '%o' $((0777 & ~$(umask))))" "$output"
|
||||
|
||||
agent_dirs=("$shared"/agents/*/)
|
||||
declare -A agent_seen
|
||||
@@ -231,4 +251,21 @@ if [ -n "$leftover_tokens" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for ((attempt = 0; attempt < 150; attempt++)); do
|
||||
if (set -o noclobber; : > "$lock") 2>/dev/null; then locked=true; break; fi
|
||||
sleep 0.2
|
||||
done
|
||||
[ "$locked" = true ] || { printf 'Another build holds %s; wait for it to finish, or remove the file if no build is running.\n' "$lock" >&2; exit 1; }
|
||||
if [ -e "$final" ]; then
|
||||
retired="$root/generated.old-sh$$-$RANDOM"
|
||||
mv -- "$final" "$retired"
|
||||
fi
|
||||
if ! mv -- "$output" "$final"; then
|
||||
[ -z "$retired" ] || mv -- "$retired" "$final"
|
||||
exit 1
|
||||
fi
|
||||
rm -f -- "$lock"
|
||||
locked=false
|
||||
[ -z "$retired" ] || rm -rf -- "$retired"
|
||||
|
||||
if [ "$summary" = true ]; then printf 'Build: PASS | 4 packages\n'; else printf 'PASS build: codex-powershell, claude-powershell, codex-bash, claude-bash\n'; fi
|
||||
Reference in new issue
Block a user