chore: apply patches from master to 3.0 (#14184)

script/bump-version.py

@@ -88,6 +88,7 @@ def main():
   suffix = ''
   if '-' in version:
     suffix = '-' + version.split('-')[1]
+    versions[3] = parse_version(version)[3]
   version = version.split('-')[0]
 
   if args.dry_run:

script/publish-to-npm.js

@@ -4,7 +4,6 @@ const path = require('path')
 const childProcess = require('child_process')
 const GitHubApi = require('github')
 const request = require('request')
-const assert = require('assert')
 const rootPackageJson = require('../package.json')
 
 if (!process.env.ELECTRON_NPM_OTP) {
@@ -124,8 +123,6 @@ new Promise((resolve, reject) => {
       env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
       cwd: tempDir
     })
-    const checkVersion = childProcess.execSync(`${path.join(tempDir, 'node_modules', '.bin', 'electron')} -v`)
-    assert.ok((`v${rootPackageJson.version}`.indexOf(checkVersion.toString().trim()) === 0), `Version is correct`)
     resolve(tarballPath)
   })
 })

script/upload-index-json.py

@@ -10,7 +10,7 @@ from lib.util import s3put, scoped_cwd, safe_mkdir
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
 
-BASE_URL = 'https://electron-metadumper.herokuapp.com/?version=v'
+BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
 
 version = sys.argv[1]
 authToken = os.getenv('META_DUMPER_AUTH_HEADER')