diff --git a/bot_scripts/assign-approved-pr-to-test.js b/bot_scripts/assign-approved-pr-to-test.js index 43f687f..098edb6 100644 --- a/bot_scripts/assign-approved-pr-to-test.js +++ b/bot_scripts/assign-approved-pr-to-test.js @@ -55,7 +55,6 @@ async function checkOpenPullRequests (robot, context) { const testedPullRequestLabelName = projectBoardConfig['tested-pr-label-name'] const contributorColumnName = projectBoardConfig['contributor-column-name'] - const toRebaseColumnName = projectBoardConfig['to-rebase-column-name'] const reviewColumnName = projectBoardConfig['review-column-name'] const testColumnName = projectBoardConfig['test-column-name'] const minReviewers = projectBoardConfig['min-reviewers'] || 1 @@ -79,7 +78,6 @@ async function checkOpenPullRequests (robot, context) { try { const columns = { contributor: findColumnByName(ghcolumns, contributorColumnName), - rebase: findColumnByName(ghcolumns, toRebaseColumnName), review: findColumnByName(ghcolumns, reviewColumnName), test: findColumnByName(ghcolumns, testColumnName), } @@ -219,8 +217,6 @@ function getColumns (state, columns) { return { srcColumns: [columns.contributor, columns.test], dstColumn: columns.review } case 'changes_requested': return { srcColumns: [columns.review, columns.test], dstColumn: columns.contributor } - case 'needs_rebase': - return { srcColumns: [columns.contributor, columns.review, columns.test], dstColumn: columns.rebase } case 'approved': return { srcColumns: [columns.contributor, columns.review], dstColumn: columns.test } default: diff --git a/lib/github-helpers.js b/lib/github-helpers.js index e1d09b5..080a61e 100644 --- a/lib/github-helpers.js +++ b/lib/github-helpers.js @@ -57,8 +57,8 @@ async function _getReviewApprovalState (context, robot, prInfo, minReviewers, te state = 'approved' break case 'dirty': + /* Currently ignored. */ robot.log.debug(`PR #${prInfo.number} - pr.mergeable_state=${pr.mergeable_state}, pr.mergeable=${pr.mergeable}`) - state = 'needs_rebase' break case 'unstable': if (filterIgnoredStatusContextFn) {