fix release numbering

Author: hiddentao

build-tools/scripts/github-release-upload-beta.js

@@ -1,21 +1,15 @@
 import fs from 'fs'
 import path from 'path'
 import GitHub from 'github-api'
-import shell from 'shelljs'
+import { exec } from '../utils'
 import { version } from '../../package.json'
 
 const { GITHUB_TOKEN } = process.env
 const DIR = path.resolve(path.join(__dirname, '..', '..'))
 const DESKTOP_PKG_DIR = path.join(DIR, 'out', 'make')
 
-const exec = cmd => {
-  const { code, stdout, stderr } = shell.exec(cmd, { cwd: DIR })
-
-  if (0 !== code) {
-    console.error(stdout)
-    console.error(stderr)
-    throw new Error(`Error executing command (exit code: ${code}): ${cmd}`)
-  }
+const _exec = cmd => {
+  exec(cmd, { cwd: DIR })
 }
 
 const build = async () => {
@@ -25,7 +19,18 @@ const build = async () => {
 
   const repo = gh.getRepo('meth', 'app')
 
-  const tag = `v${version}-beta`
+  const tagPrefix = `v${version}-beta`
+
+  // work out beta number
+  const { data: existing } = await repo.listReleases()
+  let betaNumber = 1
+  existing.forEach(r => {
+    if (r.tag_name.startsWith(tagPrefix)) {
+      betaNumber += 1
+    }
+  })
+
+  const tag = `v${version}-beta${betaNumber}`
 
   const newReleaseDetails = {
     tag_name: tag,
@@ -37,25 +42,25 @@ const build = async () => {
 
   const { data: release } = await repo.createRelease(newReleaseDetails)
 
-  console.log(`Release ID: ${release.id}`)
+  console.log(`Release ID for ${tag}: ${release.id}`)
 
   let { upload_url: uploadUrl } = release
   if (0 < uploadUrl.indexOf('{')) {
     uploadUrl = uploadUrl.substr(0, uploadUrl.indexOf('{'))
   }
 
-  console.log(`Asset upload URL: ${uploadUrl}`)
+  console.log(`Asset upload URL for ${tag}: ${uploadUrl}`)
 
   fs.readdirSync(DESKTOP_PKG_DIR).forEach(file => {
     const filePath = path.join(DESKTOP_PKG_DIR, file)
 
-    console.log(`Uploading ${filePath} ...`)
+    console.log(`Uploading ${filePath} to release ${tag} ...`)
 
-    exec(`curl --data-binary @"${filePath}" -H "Authorization: token ${GITHUB_TOKEN}" -H "Content-Type: application/octet-stream" ${uploadUrl}?name=${encodeURIComponent(file)}`)
+    _exec(`curl --data-binary @"${filePath}" -H "Authorization: token ${GITHUB_TOKEN}" -H "Content-Type: application/octet-stream" ${uploadUrl}?name=${encodeURIComponent(file)}`)
   })
 
   // public the release
-  console.log(`Publishing pre-release ...`)
+  console.log(`Publishing release ${tag} ...`)
 
   await repo.updateRelease(release.id, Object.assign({}, newReleaseDetails, {
     draft: false