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

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: use options.logger 
Refs: #77
PR-URL: #90
  • Loading branch information
@Fishrock123
Fishrock123 committed Nov 16, 2016
commit e54bc7b45bef4f0f38c677982bb0721219475ca9
18 changes: 9 additions & 9 deletions scripts/attempt-backport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function processNextBackport() {

function queueAttemptBackport(options, version, isLTS) {
queue.push(function() {
debug(`processing a new backport to v${version}`)
options.logger.debug(`processing a new backport to v${version}`)
attemptBackport(options, version, isLTS, processNextBackport)
})
}
Expand Down Expand Up @@ -121,7 +121,7 @@ function attemptBackport(options, version, isLTS, cb) {
if (!cb) return
const _cb = cb
setImmediate(() => {
debug(`backport to ${version} failed`)
options.logger.debug(`backport to ${version} failed`)
if (!isLTS) updatePrWithLabels(options, [`dont-land-on-v${version}.x`])
setImmediate(() => {
inProgress = false
Expand All @@ -134,7 +134,7 @@ function attemptBackport(options, version, isLTS, cb) {
function gitAmAbort() {
// TODO(Fishrock123): this should probably just merge into wrapCP
let exited = false
debug(`aborting any previous backport attempt...`)
options.logger.debug(`aborting any previous backport attempt...`)

const cp = child_process.spawn('git', ['am', '--abort'], { cwd: global._node_repo_dir })
const argsString = 'git am --abort'
Expand All @@ -154,22 +154,22 @@ function attemptBackport(options, version, isLTS, cb) {
}

function gitRemoteUpdate() {
debug(`updating git remotes...`)
options.logger.debug(`updating git remotes...`)
wrapCP('git', ['remote', 'update', '-p'], gitCheckout)
}

function gitCheckout() {
debug(`checking out upstream/v${version}.x-staging...`)
options.logger.debug(`checking out upstream/v${version}.x-staging...`)
wrapCP('git', ['checkout', `upstream/v${version}.x-staging`], gitReset)
}

function gitReset() {
debug(`resetting upstream/v${version}.x-staging...`)
options.logger.debug(`resetting upstream/v${version}.x-staging...`)
wrapCP('git', ['reset', `upstream/v${version}.x-staging`, '--hard'], fetchDiff)
}

function fetchDiff() {
debug(`fetching diff from pr ${options.prId}...`)
options.logger.debug(`fetching diff from pr ${options.prId}...`)

const url = `https://patch-diff.githubusercontent.com/raw/${options.owner}/${options.repo}/pull/${options.prId}.patch`

Expand All @@ -190,13 +190,13 @@ function attemptBackport(options, version, isLTS, cb) {
}

function gitAttemptBackport(req) {
debug(`attempting a backport to v${version}...`)
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`])

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