base-layer/releasekit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Run recovery handoffs for the host target

Browse Source
This commit is contained in:
Eric Rakestraw
2026-11-04 00:52:04 +00:00
parent d8ec9389e0
commit bd693ca31b
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/releasekit/main.go
View File

@@ -142,16 +142,17 @@ func selectedPublicationRecoveryCommand(ctx context.Context, result releasekit.P
if err != nil { if err != nil {
return "", err return "", err
} }
if len(args) > 0 { if args != nil {
command := "env GOWORK=off GOTOOLCHAIN=local go" prefix := "go -C " + shellQuote(git.DisplayDiagnostic(args.Directory))
for _, arg := range args { command := "(export GOWORK=off GOTOOLCHAIN=local && releasekit_host_os=$(" + prefix + " env GOHOSTOS) && releasekit_host_arch=$(" + prefix + " env GOHOSTARCH) && GOOS=\"$releasekit_host_os\" GOARCH=\"$releasekit_host_arch\" " + prefix
for _, arg := range args.Args {
command += " " + shellQuote(git.DisplayDiagnostic(arg)) command += " " + shellQuote(git.DisplayDiagnostic(arg))
} }
path, err := filepath.Abs(git.DisplayDiagnostic(result.RecordPath)) path, err := filepath.Abs(git.DisplayDiagnostic(result.RecordPath))
if err != nil { if err != nil {
return "", err return "", err
} }
return command + " reconcile --record " + shellQuote(path), nil return command + " reconcile --record " + shellQuote(path) + ")", nil
} }
} }
return publicationRecoveryCommand(result.RecordPath) return publicationRecoveryCommand(result.RecordPath)

7
cmd/releasekit/publication_handoff_test.go
View File

@@ -256,7 +256,8 @@ func TestColdGoToolRecoverySurvivesLauncherExit(t *testing.T) {
} }
// Execute from another directory after the original driver and the // Execute from another directory after the original driver and the
// API-only launcher's temporary files are gone. // API-only launcher's temporary files are gone.
evidence, err := publish.LoadEvidence(outputLineValue(text, "publication record saved: ")) originalRecord := outputLineValue(text, "publication record saved: ")
evidence, err := publish.LoadEvidence(originalRecord)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -277,10 +278,12 @@ func TestColdGoToolRecoverySurvivesLauncherExit(t *testing.T) {
} }
selected := command selected := command
if scenario.record != "" { if scenario.record != "" {
selected += " --record " + shellQuote(scenario.record) selected = strings.Replace(selected, shellQuote(originalRecord), shellQuote(scenario.record), 1)
} }
recovery := exec.Command("sh", "-c", selected) recovery := exec.Command("sh", "-c", selected)
recovery.Dir = t.TempDir() recovery.Dir = t.TempDir()
foreignOS, foreignArch := foreignTarget()
recovery.Env = setEnvironment(setEnvironment(os.Environ(), "GOOS", foreignOS), "GOARCH", foreignArch)
recovered, err := recovery.CombinedOutput() recovered, err := recovery.CombinedOutput()
if scenario.status == 0 && err != nil || scenario.status != 0 && (!errors.As(err, &exitError) || exitError.ExitCode() != scenario.status) { if scenario.status == 0 && err != nil || scenario.status != 0 && (!errors.As(err, &exitError) || exitError.ExitCode() != scenario.status) {
t.Fatalf("recovery status want %d: %v: %s", scenario.status, err, recovered) t.Fatalf("recovery status want %d: %v: %s", scenario.status, err, recovered)

2
docs/roadmap/implementation.md
View File

@@ -129,6 +129,8 @@ checks in Stage 6.
## Stage 5: Normalize the printed recovery command when it runs ## Stage 5: Normalize the printed recovery command when it runs
**Completed.**
1. In `selectedPublicationRecoveryCommand` in 1. In `selectedPublicationRecoveryCommand` in
[the CLI](../../cmd/releasekit/main.go), render the descriptor as one [the CLI](../../cmd/releasekit/main.go), render the descriptor as one
copyable POSIX shell command. Use this structure, with `<dir>`, copyable POSIX shell command. Use this structure, with `<dir>`,