fix: gen-version-info for release candidate tags

tradle · Jul 21, 2018 · 56c49b3 · 56c49b3
1 parent f557f83
commit 56c49b3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/scripts/gen-version-info.ts b/src/scripts/gen-version-info.ts
@@ -5,7 +5,10 @@ import proc from 'child_process'
 const exec = (cmd: string) => proc.execSync(cmd, { encoding: 'utf8' }).trim()
 const commit = exec(`git rev-parse HEAD`).slice(0, 8)
 const { version } = require('../../package.json')
-const [tag, commitsSinceTag] = exec(`git describe --long`).split('-')
+const [tag, commitsSinceTag] = exec(`git describe --long`)
+  .match(/^(.*?)-(\d+)-g([^-]+)$/)
+  .slice(1)
+
 const branch = exec(`git symbolic-ref --short HEAD`)
 const info = {
   commit,