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

build: clean up scripts folder, move release scripts, move zip manifest logic (#18945)

Browse source 
* build: move zip manifest logic in zip_manifests dir

* build: remove unused get-version.py script

* chore: move all release/sudowoodo related scripts into script/releases

* chore: update paths to zip manifests in CI configs

* build: fix path to ci release build script for arm tests
This commit is contained in:
Samuel Attard 2019-06-24 10:18:04 -07:00 • committed by GitHub
parent 5686a0713e
commit fb01c94511
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 122 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

3
script/lib/util.py
View file

@ -22,6 +22,9 @@ import zipfile
from lib.config import is_verbose_mode, PLATFORM
from lib.env_util import get_vs_env
ELECTRON_DIR = os.path.abspath(
os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
)
SRC_DIR = os.path.abspath(os.path.join(__file__, '..', '..', '..', '..'))
BOTO_DIR = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'vendor',
'boto'))

8
script/lib/utils.js
View file

@ -2,6 +2,8 @@ const { GitProcess } = require('dugite')
const fs = require('fs')
const path = require('path')
const ELECTRON_DIR = path.resolve(__dirname, '..', '..')
const SRC_DIR = path.resolve(ELECTRON_DIR, '..')
const OUT_DIR = process.env.ELECTRON_OUT_DIR || 'Debug'
require('colors')
@ -22,7 +24,7 @@ function getElectronExec () {
}
function getAbsoluteElectronExec () {
return path.resolve(__dirname, '../../..', getElectronExec())
return path.resolve(SRC_DIR, getElectronExec())
}
async function handleGitCall (args, gitDir) {
@ -61,5 +63,7 @@ module.exports = {
getCurrentBranch,
getElectronExec,
getAbsoluteElectronExec,
OUT_DIR
ELECTRON_DIR,
OUT_DIR,
SRC_DIR
}

82
script/lib/version-utils.js
View file

@ -1,82 +0,0 @@
const path = require('path')
const fs = require('fs')
const semver = require('semver')
const { getLastMajorForMaster } = require('../get-last-major-for-master')
const { GitProcess } = require('dugite')
const { promisify } = require('util')
const readFile = promisify(fs.readFile)
const gitDir = path.resolve(__dirname, '..', '..')
const preType = {
NONE: 'none',
PARTIAL: 'partial',
FULL: 'full'
}
const getCurrentDate = () => {
const d = new Date()
const dd = `${d.getDate()}`.padStart(2, '0')
const mm = `${d.getMonth() + 1}`.padStart(2, '0')
const yyyy = d.getFullYear()
return `${yyyy}${mm}${dd}`
}
const isNightly = v => v.includes('nightly')
const isBeta = v => v.includes('beta')
const isStable = v => {
const parsed = semver.parse(v)
return !!(parsed && parsed.prerelease.length === 0)
}
const makeVersion = (components, delim, pre = preType.NONE) => {
let version = [components.major, components.minor, components.patch].join(delim)
if (pre === preType.PARTIAL) {
version += `${delim}${components.pre[1] || 0}`
} else if (pre === preType.FULL) {
version += `-${components.pre[0]}${delim}${components.pre[1]}`
}
return version
}
async function nextBeta (v) {
const next = semver.coerce(semver.clean(v))
const tagBlob = await GitProcess.exec(['tag', '--list', '-l', `v${next}-beta.*`], gitDir)
const tags = tagBlob.stdout.split('\n').filter(e => e !== '')
tags.sort((t1, t2) => semver.gt(t1, t2))
// increment the latest existing beta tag or start at beta.1 if it's a new beta line
return tags.length === 0 ? semver.inc(next, 'beta', 'prerelease') : semver.inc(tags.pop(), 'prerelease')
}
async function getElectronVersion () {
const versionPath = path.join(__dirname, '..', '..', 'ELECTRON_VERSION')
const version = await readFile(versionPath, 'utf8')
return version.trim()
}
async function nextNightly (v) {
let next = semver.valid(semver.coerce(v))
const pre = `nightly.${getCurrentDate()}`
const branch = (await GitProcess.exec(['rev-parse', '--abbrev-ref', 'HEAD'], gitDir)).stdout.trim()
if (branch === 'master') {
next = semver.inc(await getLastMajorForMaster(), 'major')
} else if (isStable(v)) {
next = semver.inc(next, 'patch')
}
return `${next}-${pre}`
}
module.exports = {
isStable,
isBeta,
isNightly,
nextBeta,
makeVersion,
getElectronVersion,
nextNightly,
preType
}