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

chore: fix current branch fetch on master (#18844)

Browse source
This commit is contained in:
Shelley Vohr 2019-06-18 07:54:32 -07:00 committed by GitHub
parent ccd15fc12e
commit 1aac7ac9d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
script/lib/utils.js
View file

@ -28,7 +28,8 @@ function getAbsoluteElectronExec () {
async function handleGitCall (args, gitDir) { async function handleGitCall (args, gitDir) {
const details = await GitProcess.exec(args, gitDir) const details = await GitProcess.exec(args, gitDir)
if (details.exitCode === 0) { if (details.exitCode === 0) {
return details.stdout.trim() const output = details.stdout.replace(/^\*|\s+|\s+$/, '')
return output.trim()
} else { } else {
const error = GitProcess.parseError(details.stderr) const error = GitProcess.parseError(details.stderr)
console.log(`${fail} couldn't parse git process call: `, error) console.log(`${fail} couldn't parse git process call: `, error)
@ -38,10 +39,14 @@ async function handleGitCall (args, gitDir) {
async function getCurrentBranch (gitDir) { async function getCurrentBranch (gitDir) {
let branch = await handleGitCall(['rev-parse', '--abbrev-ref', 'HEAD'], gitDir) let branch = await handleGitCall(['rev-parse', '--abbrev-ref', 'HEAD'], gitDir)
if (!branch.match(/[0-9]+-[0-9]+-x/)) { if (branch !== 'master' && !branch.match(/[0-9]+-[0-9]+-x/)) {
const lastCommit = await handleGitCall(['rev-parse', 'HEAD'], gitDir) const lastCommit = await handleGitCall(['rev-parse', 'HEAD'], gitDir)
const branches = (await handleGitCall(['branch', '--contains', lastCommit], gitDir)).split('\n') const branches = (await handleGitCall(['branch', '--contains', lastCommit], gitDir)).split('\n')
branch = branches.filter(b => b.match(/[0-9]+-[0-9]+-x/))[0].trim() branch = branches.filter(b => b === 'master' || b.match(/[0-9]+-[0-9]+-x/))[0]
if (!branch) {
console.log(`${fail} no release branch exists for this ref`)
process.exit(1)
}
} }
return branch return branch
} }