Skip to content

Commit 78308be

Browse files
committed
Fix a bug in the automatic PR update...
... when updating the commit for a non-exact match Signed-off-by: David Festal <dfestal@redhat.com>
1 parent 1fee17b commit 78308be

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

update-overlay/create-pr-if-necessary.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,8 @@ Workspace reference should be manually set to commit ${workspaceCommit}.`,
299299
core.debug(`on treeSha: ${treeSha}`);
300300

301301
let deleteBackstageJson = false;
302-
if (!!workspaceCheck.backstageVersionOverride && workspaceCheck.backstageVersionOverride !== backstageVersion) {
302+
const backstageVersionOverride = prBranchExists ? prContentCheck?.backstageVersionOverride : workspaceCheck.backstageVersionOverride;
303+
if (!!backstageVersionOverride && backstageVersionOverride !== backstageVersion) {
303304
deleteBackstageJson = true;
304305
core.info(`Deleting the overridden \`backstage.json\` because it's out-of-sync (\`${workspaceCheck.backstageVersionOverride}\`) with the backstage version of the new source commit (\`${backstageVersion}\`)`);
305306
}

0 commit comments

Comments
 (0)