Browse Source

chore: fix beta bumping in 3.0 (#14173)

Samuel Attard 6 years ago
parent
commit
0f937c2300
3 changed files with 9 additions and 5 deletions
  1. 7 0
      .env.example
  2. 1 1
      script/lib/util.py
  3. 1 4
      script/prepare-release.js

+ 7 - 0
.env.example

@@ -0,0 +1,7 @@
+# These env vars are only necessary for creating Electron releases.
+# See docs/development/releasing.md
+
+APPVEYOR_TOKEN=
+CIRCLE_TOKEN=
+ELECTRON_GITHUB_TOKEN=
+VSTS_TOKEN=

+ 1 - 1
script/lib/util.py

@@ -342,7 +342,7 @@ def get_next_beta(v):
     return make_version(pv[0] , pv[1],  pv[2], 'beta.1')
 
   lv = parse_version(tag_list[-1])
-  return make_version(lv[0] , lv[1],  lv[2], str(int(lv[3]) + 1))
+  return make_version(pv[0], pv[1], pv[2], 'beta.' + str(int(lv[3]) + 1))
 
 def get_next_stable_from_pre(v):
   pv = clean_parse_version(v)

+ 1 - 4
script/prepare-release.js

@@ -33,10 +33,7 @@ github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
 async function getNewVersion (dryRun) {
   console.log(`Bumping for new "${versionType}" version.`)
   let bumpScript = path.join(__dirname, 'bump-version.py')
-  let scriptArgs = [bumpScript]
-  if (args.bump) {
-    scriptArgs.push(`--bump ${versionType}`)
-  }
+  let scriptArgs = [bumpScript, '--bump', versionType]
   if (args.stable) {
     scriptArgs.push('--stable')
   }