From ff96399b7207c3ccd05d1b508ae515ed594653af Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 18 Sep 2015 16:08:43 -0700
Subject: [PATCH] Create draft release with correct target branch

---
 build/tasks/publish-build-task.coffee | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee
index 1f8925aed..ffcca2ea7 100644
--- a/build/tasks/publish-build-task.coffee
+++ b/build/tasks/publish-build-task.coffee
@@ -31,7 +31,8 @@ module.exports = (gruntObject) ->
     cp path.join(docsOutputDir, 'api.json'), path.join(buildDir, 'atom-api.json')
 
   grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
-    switch process.env.JANKY_BRANCH
+    branchName = process.env.JANKY_BRANCH
+    switch branchName
       when 'stable'
         isPrerelease = false
       when 'beta'
@@ -54,7 +55,7 @@ module.exports = (gruntObject) ->
 
     zipAssets buildDir, assets, (error) ->
       return done(error) if error?
-      getAtomDraftRelease isPrerelease, (error, release) ->
+      getAtomDraftRelease isPrerelease, branchName, (error, release) ->
         return done(error) if error?
         assetNames = (asset.assetName for asset in assets)
         deleteExistingAssets release, assetNames, (error) ->
@@ -128,7 +129,7 @@ zipAssets = (buildDir, assets, callback) ->
     tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
   async.parallel(tasks, callback)
 
-getAtomDraftRelease = (isPrerelease, callback) ->
+getAtomDraftRelease = (isPrerelease, branchName, callback) ->
   atomRepo = new GitHub({repo: 'atom/atom', token})
   atomRepo.getReleases {prerelease: isPrerelease}, (error, releases=[]) ->
     if error?
@@ -150,9 +151,9 @@ getAtomDraftRelease = (isPrerelease, callback) ->
             firstDraft.assets = assets
             callback(null, firstDraft)
       else
-        createAtomDraftRelease(isPrerelease, callback)
+        createAtomDraftRelease(isPrerelease, branchName, callback)
 
-createAtomDraftRelease = (isPrerelease, callback) ->
+createAtomDraftRelease = (isPrerelease, branchName, callback) ->
   {version} = require('../../package.json')
   options =
     uri: 'https://api.github.com/repos/atom/atom/releases'
@@ -161,6 +162,7 @@ createAtomDraftRelease = (isPrerelease, callback) ->
     json:
       tag_name: "v#{version}"
       prerelease: isPrerelease
+      target_commitish: branchName
       name: version
       draft: true
       body: """