From 101226db977d8fa85c50bcef78f18e39735f1081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=9Aurcanu=20Dragomir?= <dragomirt22@gmail.com> Date: Tue, 3 Apr 2018 12:28:51 +0300 Subject: [PATCH] fix: add 5s sleep after automerge or restart (#1761) This hopefully gives a better chance of GitHub being able to finish computing the new mergeability status, and reduces the chance of a race condition. Closes #1617 --- lib/workers/repository/index.js | 2 ++ test/workers/repository/index.spec.js | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/workers/repository/index.js b/lib/workers/repository/index.js index 17a6f1bae8..d6954edf63 100644 --- a/lib/workers/repository/index.js +++ b/lib/workers/repository/index.js @@ -6,6 +6,7 @@ const { writeUpdates } = require('./write'); const { handleError } = require('./error'); const { pruneStaleBranches } = require('./cleanup'); const { validatePrs } = require('./validate'); +const delay = require('delay'); const { resolvePackageFiles } = require('../../manager'); @@ -81,6 +82,7 @@ async function renovateRepository(repoConfig, token, loop = 1) { : await ensureOnboardingPr(config); if (res === 'pr-closed' || res === 'automerged') { logger.info(`Restarting repo renovation after ${res}`); + await delay(5000); return renovateRepository(repoConfig, token, loop + 1); } await validatePrs(commonConfig || config); diff --git a/test/workers/repository/index.spec.js b/test/workers/repository/index.spec.js index 948ed872f5..33b28986b4 100644 --- a/test/workers/repository/index.spec.js +++ b/test/workers/repository/index.spec.js @@ -14,6 +14,7 @@ jest.mock('../../../lib/workers/repository/write'); jest.mock('../../../lib/workers/repository/cleanup'); jest.mock('../../../lib/workers/repository/validate'); jest.mock('../../../lib/manager'); +jest.mock('delay'); let config; beforeEach(() => { -- GitLab