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

🔧 Remove redundant await statements

Browse source
This commit is contained in:
Felix Rieseberg 2017-11-23 13:42:09 -08:00
parent 451a44c4b5
commit d0ef834b4f
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
script/merge-release.js
View file

@ -31,7 +31,7 @@ async function checkoutBranch (branchName) {
console.log(`Checking out ${branchName}.`) console.log(`Checking out ${branchName}.`)
let errorMessage = `Error checking out branch ${branchName}:` let errorMessage = `Error checking out branch ${branchName}:`
let successMessage = `Successfully checked out branch ${branchName}.` let successMessage = `Successfully checked out branch ${branchName}.`
return await callGit(['checkout', branchName], errorMessage, successMessage) return callGit(['checkout', branchName], errorMessage, successMessage)
} }
async function commitMerge () { async function commitMerge () {
@ -39,7 +39,7 @@ async function commitMerge () {
let errorMessage = `Error committing merge:` let errorMessage = `Error committing merge:`
let successMessage = `Successfully committed the merge for v${pkg.version}` let successMessage = `Successfully committed the merge for v${pkg.version}`
let gitArgs = ['commit', '-m', `v${pkg.version}`] let gitArgs = ['commit', '-m', `v${pkg.version}`]
return await callGit(gitArgs, errorMessage, successMessage) return callGit(gitArgs, errorMessage, successMessage)
} }
async function mergeReleaseIntoBranch (branchName) { async function mergeReleaseIntoBranch (branchName) {
@ -67,14 +67,14 @@ async function pushBranch (branchName) {
let pushArgs = ['push', 'origin', branchName] let pushArgs = ['push', 'origin', branchName]
let errorMessage = `Could not push branch ${branchName} due to an error:` let errorMessage = `Could not push branch ${branchName} due to an error:`
let successMessage = `Successfully pushed branch ${branchName}.` let successMessage = `Successfully pushed branch ${branchName}.`
return await callGit(pushArgs, errorMessage, successMessage) return callGit(pushArgs, errorMessage, successMessage)
} }
async function pull () { async function pull () {
console.log(`Performing a git pull`) console.log(`Performing a git pull`)
let errorMessage = `Could not pull due to an error:` let errorMessage = `Could not pull due to an error:`
let successMessage = `Successfully performed a git pull` let successMessage = `Successfully performed a git pull`
return await callGit(['pull'], errorMessage, successMessage) return callGit(['pull'], errorMessage, successMessage)
} }
async function rebase (targetBranch) { async function rebase (targetBranch) {
@ -82,7 +82,7 @@ async function rebase (targetBranch) {
let errorMessage = `Could not rebase due to an error:` let errorMessage = `Could not rebase due to an error:`
let successMessage = `Successfully rebased release branch from ` + let successMessage = `Successfully rebased release branch from ` +
`${targetBranch}` `${targetBranch}`
return await callGit(['rebase', targetBranch], errorMessage, successMessage) return callGit(['rebase', targetBranch], errorMessage, successMessage)
} }
async function mergeRelease () { async function mergeRelease () {

6
script/release.js
View file

@ -213,7 +213,7 @@ async function uploadShasumFile (filePath, fileName, release) {
filePath, filePath,
name: fileName name: fileName
} }
return await github.repos.uploadAsset(githubOpts) return github.repos.uploadAsset(githubOpts)
.catch(err => { .catch(err => {
console.log(`${fail} Error uploading ${filePath} to GitHub:`, err) console.log(`${fail} Error uploading ${filePath} to GitHub:`, err)
process.exit(1) process.exit(1)
@ -248,7 +248,7 @@ async function publishRelease (release) {
tag_name: release.tag_name, tag_name: release.tag_name,
draft: false draft: false
} }
return await github.repos.editRelease(githubOpts) return github.repos.editRelease(githubOpts)
.catch(err => { .catch(err => {
console.log(`${fail} Error publishing release:`, err) console.log(`${fail} Error publishing release:`, err)
process.exit(1) process.exit(1)
@ -445,7 +445,7 @@ async function cleanupReleaseBranch () {
await callGit(['branch', '-D', 'release'], errorMessage, successMessage) await callGit(['branch', '-D', 'release'], errorMessage, successMessage)
errorMessage = `Could not delete remote release branch.` errorMessage = `Could not delete remote release branch.`
successMessage = `Successfully deleted remote release branch.` successMessage = `Successfully deleted remote release branch.`
return await callGit(['push', 'origin', ':release'], errorMessage, successMessage) return callGit(['push', 'origin', ':release'], errorMessage, successMessage)
} }
async function callGit (args, errorMessage, successMessage) { async function callGit (args, errorMessage, successMessage) {