Skip to content

scripts: new attempt-backport script for PRs #90

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

Merged
Fishrock123 merged 6 commits into from
Nov 16, 2016
Merged

scripts: new attempt-backport script for PRs #90

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a5183f
scripts: new attempt-backport script for PRs
Fishrock123 Nov 2, 2016
eaa098c
attempt-backport: only run PRs targeted at master
Fishrock123 Nov 3, 2016
e54bc7b
attempt-backport: use options.logger
Fishrock123 Nov 4, 2016
323215e
attempt-backport: enable label removal for Current lines
Fishrock123 Nov 4, 2016
4df276e
attempt-backport: disable label removal for now
Fishrock123 Nov 16, 2016
5ed1046
attempt-backport: fix lint
Fishrock123 Nov 16, 2016
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
Prev Previous commit
Next Next commit
attempt-backport: enable label removal for Current lines 
Refs: #77
PR-URL: #90
  • Loading branch information
@Fishrock123
Fishrock123 committed Nov 16, 2016
commit 323215e92b75e472f5a9e9fb6bf0d417fa3e817b
25 changes: 25 additions & 0 deletions lib/node-repo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,30 @@ function updatePrWithLabels (options, labels) {
})
}

function removeLabelFromPR (options, label) {
// no need to request github if we didn't resolve a label
if (!label) {
return
}

options.logger.debug('Trying to remove label: ' + label)

githubClient.issues.removeLabel({
user: options.owner,
repo: options.repo,
number: options.prId,
name: label
}, (err) => {
if (err) {
if (err.code === 404) return options.logger.info('Label to remove did not exist, bailing ' + label)

return options.logger.error(err, 'Error while removing a label')
}

options.logger.info('Removed a label ' + label)
})
}

function fetchExistingLabels (options, cb) {
const cacheKey = `${options.owner}:${options.repo}`

Expand Down Expand Up @@ -93,6 +117,7 @@ function itemsInCommon (arr1, arr2) {
return arr1.filter((item) => arr2.indexOf(item) !== -1)
}

exports.removeLabelFromPR = removeLabelFromPR
exports.updatePrWithLabels = updatePrWithLabels
exports.resolveLabelsThenUpdatePr = deferredResolveLabelsThenUpdatePr

Expand Down
10 changes: 8 additions & 2 deletions scripts/attempt-backport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
const child_process = require('child_process')
const debug = require('debug')('attempt-backport')
const request = require('request')
const updatePrWithLabels = require('../lib/node-repo').updatePrWithLabels
const node_repo = require('../lib/node-repo')
const updatePrWithLabels = node_repo.updatePrWithLabels
const removeLabelFromPR = node_repo.removeLabelFromPR

const enabledRepos = ['node']
const queue = []
Expand Down Expand Up @@ -193,7 +195,11 @@ function attemptBackport(options, version, isLTS, cb) {
options.logger.debug(`attempting a backport to v${version}...`)
const cp = wrapCP('git', ['am'], { stdio: 'pipe' }, function done() {
// Success!
if (isLTS) updatePrWithLabels(options, [`lts-watch-v${version}.x`])
if (isLTS) {
updatePrWithLabels(options, [`lts-watch-v${version}.x`])
} else {
removeLabelFromPR(options, `dont-land-on-v${version}.x`)
}

setImmediate(() => {
options.logger.debug(`backport to v${version} successful`)
Expand Down