mirrors/pikasTech-unidesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1494 from pikasTech/fix/1476-native-trigger-state

Browse Source 
fix: infer triggered state from native pipelinerun
This commit is contained in:
Lyon
2026-07-03 15:59:33 +08:00
committed by GitHub
parent 901bd60651 7708ce6e76
commit dbe7e92af5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/src/cicd.ts
+3 -2
View File
@@ -939,11 +939,12 @@ async function decideAndMaybeTrigger(
const previousObserved = stringOrNull(recordAt(previous, ["source"])?.observedSha); const previousObserved = stringOrNull(recordAt(previous, ["source"])?.observedSha);
const previousTarget = stringOrNull(recordAt(previous, ["target"])?.targetSha); const previousTarget = stringOrNull(recordAt(previous, ["target"])?.targetSha);
const superseded = previousInFlight !== null && previousObserved !== null && observedSha !== null && previousObserved !== observedSha; const superseded = previousInFlight !== null && previousObserved !== null && observedSha !== null && previousObserved !== observedSha;
const nativePipelineRunMatchesObserved = observedSha !== null && live.pipelineRun !== null && live.pipelineRun === expectedPipelineRunName(follower, observedSha);
let phase: BranchFollowerPhase; let phase: BranchFollowerPhase;
let decision: string; let decision: string;
let triggerCommand: Record<string, unknown> | undefined; let triggerCommand: Record<string, unknown> | undefined;
let inFlightJob: string | null = live.inFlightJob; let inFlightJob: string | null = live.inFlightJob;
let lastTriggeredSha = live.lastTriggeredSha ?? previousLastTriggered; let lastTriggeredSha = live.lastTriggeredSha ?? previousLastTriggered ?? (nativePipelineRunMatchesObserved ? observedSha : null);
let lastSucceededSha = live.lastSucceededSha ?? previousLastSucceeded; let lastSucceededSha = live.lastSucceededSha ?? previousLastSucceeded;
if (targetSha === null && observedSha !== null && previousLastSucceeded === observedSha && previousTarget === observedSha) targetSha = observedSha; if (targetSha === null && observedSha !== null && previousLastSucceeded === observedSha && previousTarget === observedSha) targetSha = observedSha;
@@ -960,7 +961,7 @@ async function decideAndMaybeTrigger(
phase = "Noop"; phase = "Noop";
decision = "target already matches observed source sha"; decision = "target already matches observed source sha";
lastSucceededSha = observedSha; lastSucceededSha = observedSha;
} else if (previousLastTriggered !== null && previousLastTriggered === observedSha) { } else if (lastTriggeredSha !== null && lastTriggeredSha === observedSha) {
phase = "ClosingOut"; phase = "ClosingOut";
decision = "same sha was already triggered; use status/events/logs for closeout"; decision = "same sha was already triggered; use status/events/logs for closeout";
} else { } else {