Revert "refactor runSpawn to use @actions/exec (#205)" (#208)

This reverts commit 66727ac.

.gitignore

@@ -2,4 +2,3 @@ node_modules
 .nyc_output
 .idea
 .vscode
-coverage

.taprc

@@ -0,0 +1,4 @@
+statements: 90
+lines: 90
+functions: 78
+branches: 90

package.json

@@ -17,7 +17,6 @@
   "license": "MIT",
   "dependencies": {
     "@actions/core": "^1.10.0",
-    "@actions/exec": "^1.1.1",
     "@actions/github": "^5.1.1",
     "adm-zip": "^0.5.9",
     "lodash.isequal": "^4.5.0",

src/openPr.js

@@ -6,7 +6,7 @@ const _template = require('lodash.template')
 const core = require('@actions/core')
 
 const { PR_TITLE_PREFIX } = require('./const')
-const { execWithOutput } = require('./utils/execWithOutput')
+const { runSpawn } = require('./utils/runSpawn')
 const { callApi } = require('./utils/callApi')
 const transformCommitMessage = require('./utils/commitMessage')
 const { logInfo } = require('./log')
@@ -26,7 +26,8 @@ const addArtifact = async (inputs, releaseId) => {
 
 const createDraftRelease = async (inputs, newVersion) => {
   try {
-    const releaseCommitHash = await execWithOutput('git', ['rev-parse', 'HEAD'])
+    const run = runSpawn()
+    const releaseCommitHash = await run('git', ['rev-parse', 'HEAD'])
 
     logInfo(`Creating draft release from commit: ${releaseCommitHash}`)
 
@@ -52,6 +53,7 @@ const createDraftRelease = async (inputs, newVersion) => {
 
 module.exports = async function ({ context, inputs, packageVersion }) {
   logInfo('** Starting Opening Release PR **')
+  const run = runSpawn()
 
   if (!packageVersion) {
     throw new Error('packageVersion is missing!')
@@ -62,15 +64,15 @@ module.exports = async function ({ context, inputs, packageVersion }) {
   const branchName = `release/${newVersion}`
 
   const messageTemplate = inputs['commit-message']
-  await execWithOutput('git', ['checkout', '-b', branchName])
-  await execWithOutput('git', ['add', '-A'])
-  await execWithOutput('git', [
+  await run('git', ['checkout', '-b', branchName])
+  await run('git', ['add', '-A'])
+  await run('git', [
     'commit',
     '-m',
     `"${transformCommitMessage(messageTemplate, newVersion)}"`,
   ])
 
-  await execWithOutput('git', ['push', 'origin', branchName])
+  await run('git', ['push', 'origin', branchName])
 
   const draftRelease = await createDraftRelease(inputs, newVersion)
 
@@ -103,15 +105,14 @@ module.exports = async function ({ context, inputs, packageVersion }) {
       },
       inputs
     )
-    /* istanbul ignore else */
     if (response?.status !== 201) {
       const errMessage = response?.message || 'PR creation failed'
       throw new Error(errMessage)
     }
   } catch (err) {
     let message = `Unable to create the pull request ${err.message}`
     try {
-      await execWithOutput('git', ['push', 'origin', '--delete', branchName])
+      await run('git', ['push', 'origin', '--delete', branchName])
     } catch (error) {
       message += `\n Unable to delete branch ${branchName}:  ${error.message}`
     }

src/release.js

@@ -6,7 +6,7 @@ const semver = require('semver')
 const { PR_TITLE_PREFIX } = require('./const')
 const { callApi } = require('./utils/callApi')
 const { tagVersionInGit } = require('./utils/tagVersion')
-const { execWithOutput } = require('./utils/execWithOutput')
+const { runSpawn } = require('./utils/runSpawn')
 const { revertCommit } = require('./utils/revertCommit')
 const { publishToNpm } = require('./utils/publishToNpm')
 const { notifyIssues } = require('./utils/notifyIssues')
@@ -60,13 +60,14 @@ module.exports = async function ({ github, context, inputs }) {
     return
   }
 
+  const run = runSpawn()
   const branchName = `release/${version}`
 
   try {
     // We "always" delete the release branch, if anything fails, the whole
     // workflow has to be restarted from scratch.
     logInfo(`deleting ${branchName}`)
-    await execWithOutput('git', ['push', 'origin', '--delete', branchName])
+    await run('git', ['push', 'origin', '--delete', branchName])
   } catch (err) {
     // That's not a big problem, so we don't want to mark the action as failed.
     logWarning('Unable to delete the release branch')

src/utils/artifact.js

@@ -9,7 +9,6 @@ const { ZIP_EXTENSION } = require('../const')
 const attach = async (path, releaseId, token) => {
   const filename = deriveFilename(path, ZIP_EXTENSION)
 
-  /* istanbul ignore else */
   if (!path.endsWith(ZIP_EXTENSION)) {
     await archiveItem(path, filename)
   }

src/utils/publishToNpm.js

@@ -1,14 +1,16 @@
 'use strict'
 
-const { execWithOutput } = require('./execWithOutput')
+const { runSpawn } = require('./runSpawn')
 
 async function allowNpmPublish(version) {
+  const run = runSpawn()
+
   // We need to check if the package was already published. This can happen if
   // the action was already executed before, but it failed in its last step
   // (GH release).
   let packageName = null
   try {
-    const packageInfo = await execWithOutput('npm', ['view', '--json'])
+    const packageInfo = await run('npm', ['view', '--json'])
     packageName = packageInfo ? JSON.parse(packageInfo).name : null
   } catch (error) {
     if (!error?.message?.match(/code E404/)) {
@@ -29,10 +31,7 @@ async function allowNpmPublish(version) {
   try {
     // npm < v8.13.0 returns empty output, newer versions throw a E404
     // We handle both and consider them as package version not existing
-    packageVersionInfo = await execWithOutput('npm', [
-      'view',
-      `${packageName}@${version}`,
-    ])
+    packageVersionInfo = await run('npm', ['view', `${packageName}@${version}`])
   } catch (error) {
     if (!error?.message?.match(/code E404/)) {
       throw error
@@ -49,22 +48,21 @@ async function publishToNpm({
   npmTag,
   version,
 }) {
-  await execWithOutput('npm', [
+  const run = runSpawn()
+
+  await run('npm', [
     'config',
     'set',
     `//registry.npmjs.org/:_authToken=${npmToken}`,
   ])
 
   if (await allowNpmPublish(version)) {
-    await execWithOutput('npm', ['pack', '--dry-run'])
+    await run('npm', ['pack', '--dry-run'])
     if (opticToken) {
-      const otp = await execWithOutput('curl', [
-        '-s',
-        `${opticUrl}${opticToken}`,
-      ])
-      await execWithOutput('npm', ['publish', '--otp', otp, '--tag', npmTag])
+      const otp = await run('curl', ['-s', `${opticUrl}${opticToken}`])
+      await run('npm', ['publish', '--otp', otp, '--tag', npmTag])
     } else {
-      await execWithOutput('npm', ['publish', '--tag', npmTag])
+      await run('npm', ['publish', '--tag', npmTag])
     }
   }
 }

src/utils/revertCommit.js

@@ -1,9 +1,11 @@
 'use strict'
-const { execWithOutput } = require('./execWithOutput')
+const { runSpawn } = require('./runSpawn')
 
 async function revertCommit(baseRef) {
-  await execWithOutput('git', ['revert', 'HEAD'])
-  await execWithOutput('git', ['push', 'origin', baseRef])
+  const run = runSpawn()
+
+  await run('git', ['revert', 'HEAD'])
+  await run('git', ['push', 'origin', baseRef])
 }
 
 exports.revertCommit = revertCommit

src/utils/runSpawn.js

@@ -0,0 +1,36 @@
+'use strict'
+
+const { spawn } = require('child_process')
+
+function runSpawn({ cwd } = {}) {
+  return (cmd, args) => {
+    return new Promise((resolve, reject) => {
+      const cli = spawn(cmd, args, { cwd, env: process.env, shell: true })
+      cli.stdout.setEncoding('utf8')
+      cli.stderr.setEncoding('utf8')
+
+      let stdout = ''
+      let stderr = ''
+      cli.stdout.on('data', data => {
+        stdout += data
+      })
+      cli.stderr.on('data', data => {
+        stderr += data
+      })
+      cli.on('close', (code, signal) => {
+        if (code === 0) {
+          return resolve(stdout.trim())
+        }
+        reject(
+          new Error(
+            `${cmd} ${args.join(
+              ' '
+            )} returned code ${code} and signal ${signal}\nSTDOUT: ${stdout}\nSTDERR: ${stderr}`
+          )
+        )
+      })
+    })
+  }
+}
+
+exports.runSpawn = runSpawn

src/utils/tagVersion.js

@@ -1,10 +1,12 @@
 'use strict'
-const { execWithOutput } = require('./execWithOutput')
+const { runSpawn } = require('./runSpawn')
 
 async function tagVersionInGit(version) {
-  await execWithOutput('git', ['push', 'origin', `:refs/tags/${version}`])
-  await execWithOutput('git', ['tag', '-f', `"${version}"`])
-  await execWithOutput('git', ['push', 'origin', `--tags`])
+  const run = runSpawn()
+
+  await run('git', ['push', 'origin', `:refs/tags/${version}`])
+  await run('git', ['tag', '-f', `"${version}"`])
+  await run('git', ['push', 'origin', `--tags`])
 }
 
 exports.tagVersionInGit = tagVersionInGit