This commit is contained in:
Henri Maurer
2023-06-07 16:51:53 +01:00
parent 90d3a94eb7
commit a82096e68a
3 changed files with 17 additions and 9 deletions
Generated Vendored
+14 -6
View File
@@ -188,7 +188,7 @@ function compare({ owner, repo, baseRef, headRef }) {
let snapshot_warnings = '';
const changes = yield octo.paginate({
method: 'GET',
url: '/repos/{owner}/{repo}/dependency-graph/compare/{basehead}',
url: '/repos/{owner}/{repo}/dependency-graph/compare/{basehead}?includes_dependency_snapshots=true',
owner,
repo,
basehead: `${baseRef}...${headRef}`
@@ -486,7 +486,9 @@ const git_refs_1 = __nccwpck_require__(1086);
const utils_1 = __nccwpck_require__(918);
const comment_pr_1 = __nccwpck_require__(5842);
function delay(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
return __awaiter(this, void 0, void 0, function* () {
return new Promise(resolve => setTimeout(resolve, ms));
});
}
function run() {
return __awaiter(this, void 0, void 0, function* () {
@@ -495,23 +497,29 @@ function run() {
const refs = (0, git_refs_1.getRefs)(config, github.context);
let changes;
let snapshot_warnings;
for (let i = 0; i < 60 * 5; i++) {
let i = 0;
while (true) {
const comparison = yield dependencyGraph.compare({
owner: github.context.repo.owner,
repo: github.context.repo.repo,
baseRef: refs.base,
headRef: refs.head
});
if (comparison.snapshot_warnings.match(/No snapshots were found for the head SHA/i)) {
if (i >= 12) {
core.setFailed('Exhausted retries. Exiting.');
return;
}
else if (comparison.snapshot_warnings.trim() !== '') {
core.info(comparison.snapshot_warnings);
core.info('Retrying in 1 second...');
yield delay(1000);
core.info('Retrying in 10 seconds...');
yield delay(10000);
}
else {
changes = comparison.changes;
snapshot_warnings = comparison.snapshot_warnings;
break;
}
i++;
}
if (!changes) {
core.info('No Dependency Changes found. Skipping Dependency Review.');
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -17,7 +17,7 @@ import {getRefs} from './git-refs'
import {groupDependenciesByManifest} from './utils'
import {commentPr} from './comment-pr'
function delay(ms: number): Promise<void> {
async function delay(ms: number): Promise<void> {
return new Promise(resolve => setTimeout(resolve, ms))
}
@@ -40,7 +40,7 @@ async function run(): Promise<void> {
if (i >= 12) {
core.setFailed('Exhausted retries. Exiting.')
return
} else if (comparison.snapshot_warnings.trim() != '') {
} else if (comparison.snapshot_warnings.trim() !== '') {
core.info(comparison.snapshot_warnings)
core.info('Retrying in 10 seconds...')
await delay(10000)