diff --git a/script/merge-release.js b/script/merge-release.js index 60ac3acb244c..8917da4f2f23 100755 --- a/script/merge-release.js +++ b/script/merge-release.js @@ -31,7 +31,7 @@ async function checkoutBranch (branchName) { console.log(`Checking out ${branchName}.`) let errorMessage = `Error checking 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 () { @@ -39,7 +39,7 @@ async function commitMerge () { let errorMessage = `Error committing merge:` let successMessage = `Successfully committed the merge for 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) { @@ -67,14 +67,14 @@ async function pushBranch (branchName) { let pushArgs = ['push', 'origin', branchName] let errorMessage = `Could not push branch ${branchName} due to an error:` let successMessage = `Successfully pushed branch ${branchName}.` - return await callGit(pushArgs, errorMessage, successMessage) + return callGit(pushArgs, errorMessage, successMessage) } async function pull () { console.log(`Performing a git pull`) let errorMessage = `Could not pull due to an error:` let successMessage = `Successfully performed a git pull` - return await callGit(['pull'], errorMessage, successMessage) + return callGit(['pull'], errorMessage, successMessage) } async function rebase (targetBranch) { @@ -82,7 +82,7 @@ async function rebase (targetBranch) { let errorMessage = `Could not rebase due to an error:` let successMessage = `Successfully rebased release branch from ` + `${targetBranch}` - return await callGit(['rebase', targetBranch], errorMessage, successMessage) + return callGit(['rebase', targetBranch], errorMessage, successMessage) } async function mergeRelease () { diff --git a/script/release.js b/script/release.js index 42c55b5cee3b..5b62d529bd09 100755 --- a/script/release.js +++ b/script/release.js @@ -213,7 +213,7 @@ async function uploadShasumFile (filePath, fileName, release) { filePath, name: fileName } - return await github.repos.uploadAsset(githubOpts) + return github.repos.uploadAsset(githubOpts) .catch(err => { console.log(`${fail} Error uploading ${filePath} to GitHub:`, err) process.exit(1) @@ -248,7 +248,7 @@ async function publishRelease (release) { tag_name: release.tag_name, draft: false } - return await github.repos.editRelease(githubOpts) + return github.repos.editRelease(githubOpts) .catch(err => { console.log(`${fail} Error publishing release:`, err) process.exit(1) @@ -445,7 +445,7 @@ async function cleanupReleaseBranch () { await callGit(['branch', '-D', 'release'], errorMessage, successMessage) errorMessage = `Could not delete 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) {