Chore: Fix errors in release script

Fix getting late output from exec calls (was being dropped). Also fix handling null authors in release script. - - - - - - - - - - - - - - - - - - - - Close #5071
webhintio · Mar 3, 2022 · 81f5e3d · 81f5e3d
1 parent 9a4d3b7
commit 81f5e3d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/release/lib/git-helpers.ts b/release/lib/git-helpers.ts
@@ -81,6 +81,12 @@ const getResponseForCommitInfoRequest = async (commitSHA: string) => {
 
         const commitInfo = result.data;
 
+        if (!commitInfo.author) {
+            debug(`No GitHub author found for commit ${commitSHA}`);
+
+            return null;
+        }
+
         /*
          * Get commit author related info.
          *
@@ -89,21 +95,19 @@ const getResponseForCommitInfoRequest = async (commitSHA: string) => {
          * which in most cases, is wrongly set.
          */
 
-        const cachedAuthor = commitInfo.author && authors.get(commitInfo.author.login);
+        const cachedAuthor = authors.get(commitInfo.author.login);
 
         if (cachedAuthor) {
-            debug(`Reusing cached Author ${commitInfo.author?.login}`);
+            debug(`Reusing cached Author ${commitInfo.author.login}`);
 
             return cachedAuthor;
         }
 
-        debug(`Requesting info for login ${commitInfo.author?.login}`);
+        debug(`Requesting info for login ${commitInfo.author.login}`);
 
         const responseForUserInfoRequestPromise = getResponseForUserInfoRequest(commitInfo);
 
-        if (commitInfo.author) {
-            authors.set(commitInfo.author.login, responseForUserInfoRequestPromise);
-        }
+        authors.set(commitInfo.author.login, responseForUserInfoRequestPromise);
 
         return responseForUserInfoRequestPromise;
     } catch (e) {

diff --git a/scripts/utils/exec.js b/scripts/utils/exec.js
@@ -21,22 +21,27 @@ const exec = (cmd, options = {}) => {
             ...options
         });
 
-        command.stdout?.on('data', (data) => {
-            stdout += data;
-        });
+        if (command.stdout) {
+            command.stdout.on('data', (data) => {
+                stdout += data;
+            });
+
+            command.stdout.on('close', () => {
+                resolve({ stdout: stdout.trimEnd() });
+            });
+        }
 
         command.on('error', (err) => {
-            return reject(err);
+            reject(err);
         });
 
         command.on('exit', (code) => {
-            if (code !== 0) {
-                return reject(new Error('NoExitCodeZero'));
+            if (code) {
+                reject(new Error(`Exit Code: ${code}\n${stdout}`));
+            } else if (!command.stdout) {
+                resolve({ stdout: '' });
             }
-
-            return resolve({ stdout: stdout.trimEnd() });
         });
-
     });
 };