Skip to content

fix(ci): remove isStaleCiRun to prevent ci pr hang on SSH host-key prompt #10300

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
davidfirst merged 1 commit into from
Apr 15, 2026
+0 −32
Merged

fix(ci): remove isStaleCiRun to prevent ci pr hang on SSH host-key prompt #10300

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
32 changes: 0 additions & 32 deletions scopes/git/ci/ci.main.runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,14 +856,6 @@ export class CiMain {
return await this.exporter.export();
} catch (e: any) {
if (!isHashMismatchErr(e) || attempt === maxAttempts) throw e;
if (await this.isStaleCiRun()) {
this.logger.console(
chalk.yellow(
`Export failed with lane hash mismatch on "${laneIdStr}" and the PR branch has advanced past our commit. Not retrying - a newer CI run will publish the correct lane.`
)
);
throw e;
}
this.logger.console(
chalk.yellow(
`Export attempt ${attempt}/${maxAttempts} failed with lane hash mismatch on "${laneIdStr}" (likely a concurrent CI push). Deleting remote lane and retrying.`
Expand All @@ -889,30 +881,6 @@ export class CiMain {
throw new Error(`exportWithRetryOnLaneHashMismatch: exhausted ${maxAttempts} attempts for lane ${laneIdStr}`);
}

/**
* Returns true when the PR branch on the remote has advanced past our local HEAD, meaning a
* newer commit was pushed to the branch while this CI run was in flight. Best-effort: when we
* can't determine the branch or reach the remote we return false (don't block retry).
*/
private async isStaleCiRun(): Promise<boolean> {
try {
const branch = await this.getBranchName();
if (!branch) return false;
const localSha = (await git.revparse(['HEAD'])).trim();
// `--` separator and fully-qualified ref so a branch name starting with `-` can't be
// interpreted as a git option (defense in depth for untrusted PR branches).
await git.raw(['fetch', 'origin', '--', `refs/heads/${branch}:refs/remotes/origin/${branch}`]);
const remoteSha = (await git.revparse([`refs/remotes/origin/${branch}`])).trim();
if (remoteSha === localSha) return false;
const mergeBase = (await git.raw(['merge-base', localSha, remoteSha])).trim();
// local is strictly behind remote - remote has commits we don't.
return mergeBase === localSha;
} catch (err: any) {
this.logger.console(chalk.yellow(`Unable to verify CI run freshness (assuming fresh): ${err?.message || err}`));
return false;
}
}

/**
* Archives (deletes) a lane with proper error handling and logging.
* @param throwOnError - if true, throws on failure (use for critical operations like pre-export cleanup)
Expand Down