Skip to content
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

Jump to bottom

fix: interrupt as soon as we retry #31

Merged
merged 1 commit into from
Aug 7, 2020
Merged

fix: interrupt as soon as we retry #31

Show file tree
Hide file tree
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
17 changes: 7 additions & 10 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7611,7 +7611,7 @@ function main() {
core.debug(`isPushEvent = ${process.env.GITHUB_EVENT_NAME} === "push"`);
const baseRefName = isPushEvent ? getBranchName(github.context.ref) : null;
const client = github.getOctokit(repoToken);
yield checkDirty({
const dirtyStatuses = yield checkDirty({
baseRefName,
client,
commentOnClean,
Expand All @@ -7622,6 +7622,7 @@ function main() {
retryAfter,
retryMax,
});
core.setOutput(prDirtyStatusesOutputKey, dirtyStatuses);
});
}
const continueOnMissingPermissions = () => core.getInput("continueOnMissingPermissions") === "true" || false;
Expand Down Expand Up @@ -7706,24 +7707,20 @@ query openPullRequests($owner: String!, $repo: String!, $after: String, $baseRef
break;
case "UNKNOWN":
info(`Retrying after ${retryAfter}s.`);
yield new Promise((resolve) => {
return new Promise((resolve) => {
setTimeout(() => {
core.info(`retrying with ${retryMax} retries remaining.`);
resolve(() => __awaiter(this, void 0, void 0, function* () {
dirtyStatuses = Object.assign(Object.assign({}, dirtyStatuses), (yield checkDirty(Object.assign(Object.assign({}, context), { retryMax: retryMax - 1 }))));
}));
checkDirty(Object.assign(Object.assign({}, context), { retryMax: retryMax - 1 })).then((newDirtyStatuses) => {
resolve(Object.assign(Object.assign({}, dirtyStatuses), newDirtyStatuses));
});
}, retryAfter * 1000);
});
break;
default:
throw new TypeError(`unhandled mergeable state '${pullRequest.mergeable}'`);
}
}
if (pageInfo.hasNextPage) {
dirtyStatuses = Object.assign(Object.assign({}, dirtyStatuses), (yield checkDirty(Object.assign(Object.assign({}, context), { after: pageInfo.endCursor }))));
}
else {
core.setOutput(prDirtyStatusesOutputKey, dirtyStatuses);
return Object.assign(Object.assign({}, dirtyStatuses), (yield checkDirty(Object.assign(Object.assign({}, context), { after: pageInfo.endCursor }))));
}
return dirtyStatuses;
});
Expand Down
26 changes: 14 additions & 12 deletions sources/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ async function main() {

const client = github.getOctokit(repoToken);

await checkDirty({
const dirtyStatuses = await checkDirty({
baseRefName,
client,
commentOnClean,
Expand All @@ -42,6 +42,8 @@ async function main() {
retryAfter,
retryMax,
});

core.setOutput(prDirtyStatusesOutputKey, dirtyStatuses);
}

const continueOnMissingPermissions = () =>
Expand Down Expand Up @@ -194,18 +196,20 @@ query openPullRequests($owner: String!, $repo: String!, $after: String, $baseRef
break;
case "UNKNOWN":
info(`Retrying after ${retryAfter}s.`);
await new Promise((resolve) => {
return new Promise((resolve) => {
setTimeout(() => {
core.info(`retrying with ${retryMax} retries remaining.`);
resolve(async () => {
dirtyStatuses = {
...dirtyStatuses,
...(await checkDirty({ ...context, retryMax: retryMax - 1 })),
};
});

checkDirty({ ...context, retryMax: retryMax - 1 }).then(
(newDirtyStatuses) => {
resolve({
...dirtyStatuses,
...newDirtyStatuses,
});
}
);
}, retryAfter * 1000);
});
break;
default:
throw new TypeError(
`unhandled mergeable state '${pullRequest.mergeable}'`
Expand All @@ -214,15 +218,13 @@ query openPullRequests($owner: String!, $repo: String!, $after: String, $baseRef
}

if (pageInfo.hasNextPage) {
dirtyStatuses = {
return {
...dirtyStatuses,
...(await checkDirty({
...context,
after: pageInfo.endCursor,
})),
};
} else {
core.setOutput(prDirtyStatusesOutputKey, dirtyStatuses);
}
return dirtyStatuses;
}
Expand Down