chore: fix release utils pathing

heroku · May 1, 2020 · 2b65a91 · 2b65a91
1 parent c0e0d5f
commit 2b65a91
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 7 deletions.
diff --git a/scripts/release/deb b/scripts/release/deb
@@ -4,7 +4,7 @@ const qq = require('qqjs')
 
 qq.config.silent = false
 qq.run(async () => {
-  await require('../utils/_update_channel')()
+  await require('./utils/_update_channel')()
   await qq.x('echo "$HEROKU_DEB_SECRET_KEY" | base64 -d | gpg --import')
   await qq.x('./node_modules/.bin/oclif-dev pack:deb')
   await qq.x('./node_modules/.bin/oclif-dev publish:deb')

diff --git a/scripts/release/homebrew b/scripts/release/homebrew
@@ -7,7 +7,7 @@ if [[ -z "${CIRCLE_TAG}" ]]; then
   exit
 fi
 
-./scripts/utils/_github_setup
+./scripts/release/utils/_github_setup
 
 rm -rf tmp/homebrew-brew
 git config --global core.pager cat

diff --git a/scripts/release/macos_installer_trigger b/scripts/release/macos_installer_trigger
@@ -7,7 +7,7 @@ if [[ -z "${CIRCLE_TAG}" ]]; then
   exit
 fi
 
-./scripts/utils/_github_setup
+./scripts/release/utils/_github_setup
 
 VERSION=$(node -p "require('./packages/cli/package.json').version")
 

diff --git a/scripts/release/tarballs b/scripts/release/tarballs
@@ -4,7 +4,7 @@ const qq = require('qqjs')
 
 qq.config.silent = false
 qq.run(async () => {
-  await require('../utils/_update_channel')()
+  await require('./utils/_update_channel')()
   await qq.x('./node_modules/.bin/oclif-dev pack')
   await qq.x('./node_modules/.bin/oclif-dev publish')
 })
diff --git a/scripts/utils/_fetch_node_binary → scripts/release/utils/_fetch_node_binary b/scripts/utils/_fetch_node_binary → scripts/release/utils/_fetch_node_binary
diff --git a/scripts/utils/_github_setup → scripts/release/utils/_github_setup b/scripts/utils/_github_setup → scripts/release/utils/_github_setup
diff --git a/scripts/release/utils/_update_channel.js b/scripts/release/utils/_update_channel.js
@@ -0,0 +1,13 @@
+const qq = require('qqjs')
+
+module.exports = async () => {
+  const pjson = await qq.readJSON('./package.json')
+  if (process.env.CIRCLE_TAG && process.env.CIRCLE_TAG.startsWith('v')) {
+    pjson.version = pjson.version.split('-')[0]
+  } else if (process.env.CIRCLE_BRANCH === 'master') {
+    pjson.version = pjson.version.split('-')[0] + '-beta'
+  } else {
+    pjson.version = pjson.version.split('-')[0] + '-dev'
+  }
+  await qq.writeJSON('./package.json', pjson)
+}
diff --git a/scripts/release/utils/_version.js b/scripts/release/utils/_version.js
@@ -0,0 +1,11 @@
+const qq = require('qqjs')
+
+module.exports = async () => {
+  let { version } = require('../../packages/cli/package.json')
+  if (version.includes('-')) {
+    let channel = version.split('-')[1].split('.')[0]
+    let sha = await qq.x.stdout('git', ['rev-parse', '--short', 'HEAD'])
+    version = `${version.split('-')[0]}-${channel}.${sha}`
+  }
+  return version
+}
diff --git a/scripts/release/win b/scripts/release/win
@@ -4,8 +4,8 @@ const qq = require('qqjs')
 
 qq.config.silent = false
 qq.run(async () => {
-  await require('../utils/_update_channel')()
-  const version = await require('../utils/_version')()
+  await require('./utils/_update_channel')()
+  const version = await require('./utils/_version')()
   await qq.x('./node_modules/.bin/oclif-dev pack:win')
   await qq.x('echo "$HEROKU_WINDOWS_KEY" | base64 --decode > /tmp/heroku-windows-key')
   await qq.x(`mv dist/win/heroku-v${version}-x86.exe dist/win/heroku-v${version}-x86-unsigned.exe`)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -35,7 +35,7 @@ parts:
       tar xvzf heroku.tar.gz
       rmdir ../install
       mv package ../install
-      OS=linux ./scripts/utils/_fetch_node_binary ../install/bin
+      OS=linux ./scripts/release/utils/_fetch_node_binary ../install/bin
       cd ../install && yarn --prod
       cd ../install && bin/run -v
       sed -i 's/#!\/usr\/bin\/env node/#!\/snap\/heroku\/current\/bin\/node/' ../install/bin/run
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ if [[ -z "${CIRCLE_TAG}" ]]; then @@
       exit
     fi
-    ./scripts/utils/_github_setup
+    ./scripts/release/utils/_github_setup
     VERSION=$(node -p "require('./packages/cli/package.json').version")
@@ Expand Down @@