mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Samuel Attard 2018-08-17 17:42:46 -07:00 committed by GitHub
parent 0f937c2300
commit bd4334e2b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
script/bump-version.py
View file

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

3
script/publish-to-npm.js
View file

@ -4,7 +4,6 @@ const path = require('path')
const childProcess = require('child_process') const childProcess = require('child_process')
const GitHubApi = require('github') const GitHubApi = require('github')
const request = require('request') const request = require('request')
const assert = require('assert')
const rootPackageJson = require('../package.json') const rootPackageJson = require('../package.json')
if (!process.env.ELECTRON_NPM_OTP) { if (!process.env.ELECTRON_NPM_OTP) {
@ -124,8 +123,6 @@ new Promise((resolve, reject) => {
env: Object.assign({}, process.env, { electron_config_cache: tempDir }), env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
cwd: 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) resolve(tarballPath)
}) })
}) })

2
script/upload-index-json.py
View file

@ -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__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'D') 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] version = sys.argv[1]
authToken = os.getenv('META_DUMPER_AUTH_HEADER') authToken = os.getenv('META_DUMPER_AUTH_HEADER')