From 6de26d3b4a2315d09cd5ee5cdc2db5fb0d979289 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <trop[bot]@users.noreply.github.com>
Date: Wed, 5 Dec 2018 09:36:35 -0800
Subject: [PATCH] chore: expose release id for use in cleanup (#15845) (#15949)

chore: expose release id for use in cleanup (backport: 3-0-x)
---
 script/prepare-release.js          |  8 ++++----
 script/release-artifact-cleanup.js | 24 +++++++++++++-----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/script/prepare-release.js b/script/prepare-release.js
index 5a197544a616..133298a96f56 100755
--- a/script/prepare-release.js
+++ b/script/prepare-release.js
@@ -149,7 +149,7 @@ async function createRelease (branchToTarget, isBeta) {
   console.log(`Checking for existing draft release.`)
   let releases = await github.repos.getReleases(githubOpts)
     .catch(err => {
-      console.log('$fail} Could not get releases.  Error was', err)
+      console.log(`${fail} Could not get releases. Error was: `, err)
     })
   let drafts = releases.data.filter(release => release.draft &&
     release.tag_name === newVersion)
@@ -180,13 +180,13 @@ async function createRelease (branchToTarget, isBeta) {
   }
   githubOpts.tag_name = newVersion
   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-  console.log('creating release with github opts', githubOpts)
-  await github.repos.createRelease(githubOpts)
+  const release = await github.repos.createRelease(githubOpts)
     .catch(err => {
       console.log(`${fail} Error creating new release: `, err)
       process.exit(1)
     })
-  console.log(`${pass} Draft release for ${newVersion} has been created.`)
+  console.log(`Release has been created with id: ${release.id}.`)
+  console.log(`${pass} Draft release for ${newVersion} successful.`)
 }
 
 async function pushRelease (branch) {
diff --git a/script/release-artifact-cleanup.js b/script/release-artifact-cleanup.js
index 99646c76184c..fdc92b528d54 100755
--- a/script/release-artifact-cleanup.js
+++ b/script/release-artifact-cleanup.js
@@ -50,13 +50,14 @@ async function revertBumpCommit (tag) {
   }
 }
 
-async function deleteDraft (tag, targetRepo) {
+async function deleteDraft (releaseId, targetRepo) {
   try {
-    const result = await github.repos.getReleaseByTag({
+    const result = await github.repos.getRelease({
       owner: 'electron',
       repo: targetRepo,
-      tag
+      id: parseInt(releaseId, 10)
     })
+    console.log(result)
     if (!result.draft) {
       console.log(`Published releases cannot be deleted.`)
       process.exit(1)
@@ -67,9 +68,9 @@ async function deleteDraft (tag, targetRepo) {
         release_id: result.id
       })
     }
-    console.log(`Successfully deleted draft with tag ${tag} from ${targetRepo}`)
+    console.log(`Successfully deleted draft with id ${releaseId} from ${targetRepo}`)
   } catch (err) {
-    console.error(`Couldn't delete draft with tag ${tag} from ${targetRepo}: `, err)
+    console.error(`Couldn't delete draft with id ${releaseId} from ${targetRepo}: `, err)
     process.exit(1)
   }
 }
@@ -89,18 +90,19 @@ async function deleteTag (tag, targetRepo) {
 }
 
 async function cleanReleaseArtifacts () {
-  const tag = args.tag
+  const releaseId = args.releaseId
   const isNightly = args.tag.includes('nightly')
 
   if (isNightly) {
-    await deleteDraft(tag, 'nightlies')
-    await deleteTag(tag, 'nightlies')
+    await deleteDraft(releaseId, 'nightlies')
+    await deleteTag(args.tag, 'nightlies')
   } else {
-    await deleteDraft(tag, 'electron')
+    console.log('we are here')
+    await deleteDraft(releaseId, 'electron')
   }
 
-  await deleteTag(tag, 'electron')
-  await revertBumpCommit(tag)
+  await deleteTag(args.tag, 'electron')
+  await revertBumpCommit(args.tag)
 
   console.log('Failed release artifact cleanup complete')
 }