mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-08-16 15:50:37 +03:00
Work around bug in PR status after branch push
- gh can incorrectly report checks as completed even though they just started - can be marked completed because not all checks are initially included in the check suite - for GitButler specifically somtimes check-runs includes only a single completed GitGuardian check
This commit is contained in:
parent
ec52598f62
commit
cf78a5b58b
@ -101,12 +101,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function scheduleNextUpdate() {
|
function scheduleNextUpdate() {
|
||||||
if (!checksStatus || checksStatus.completed) return;
|
if (!checksStatus) return;
|
||||||
|
|
||||||
const startedAt = checksStatus.startedAt;
|
const startedAt = checksStatus.startedAt;
|
||||||
if (!startedAt) return;
|
if (!startedAt) return;
|
||||||
|
|
||||||
const secondsAgo = (new Date().getTime() - startedAt.getTime()) / 1000;
|
const secondsAgo = (Date.now() - startedAt.getTime()) / 1000;
|
||||||
|
// Only stop polling for updates if checks have completed and check suite age is
|
||||||
|
// more than a minute. We do this to work around a bug where just after pushing
|
||||||
|
// to a branch GitHub might not report all the checks that will eventually be
|
||||||
|
// run as part of the suite.
|
||||||
|
if (checksStatus.completed && secondsAgo > 60) return;
|
||||||
|
|
||||||
let timeUntilUdate: number | undefined = undefined;
|
let timeUntilUdate: number | undefined = undefined;
|
||||||
|
|
||||||
if (secondsAgo < 60) {
|
if (secondsAgo < 60) {
|
||||||
@ -221,8 +227,7 @@
|
|||||||
text: 'Your PR has conflicts that must be resolved before merging.'
|
text: 'Your PR has conflicts that must be resolved before merging.'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
if (mergeableState === 'blocked' && !isFetchingChecks && checksStatus.failed > 0) {
|
||||||
if (mergeableState === 'blocked' && !isFetchingChecks) {
|
|
||||||
return {
|
return {
|
||||||
icon: 'error',
|
icon: 'error',
|
||||||
messageStyle: 'error',
|
messageStyle: 'error',
|
||||||
|
Loading…
Reference in New Issue
Block a user