fixup! Fix #49: Hide most output behind output groups

cross-platform-actions · Mar 4, 2023 · 2fcee9d · 2fcee9d
1 parent a109f9a
commit 2fcee9d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/action/action.ts b/src/action/action.ts
@@ -126,9 +126,12 @@ export class Action {
         await vm.stop()
       }
     } finally {
-      core.endGroup()
-      await vm.terminate()
-      fs.rmdirSync(this.tempPath, {recursive: true})
+      try {
+        await vm.terminate()
+        fs.rmdirSync(this.tempPath, {recursive: true})
+      } finally {
+        core.endGroup()
+      }
     }
   }
 
@@ -271,7 +274,8 @@ export class Action {
         '-c',
         `'cd "${process.env['GITHUB_WORKSPACE']}" && exec "${sh}" -e'`
       ],
-      Buffer.from(this.input.run)
+      Buffer.from(this.input.run),
+      {silent: !core.isDebug()}
     )
   }
 

diff --git a/src/vm.ts b/src/vm.ts
@@ -133,16 +133,21 @@ export abstract class Vm {
 
     return await exec.exec('ssh', ['-t', `${Vm.user}@${this.ipAddress}`], {
       input: buffer,
-      silent: options.silent,
-      ignoreReturnCode: options.ignoreReturnCode
+      ...options
     })
   }
 
-  async execute2(args: string[], intput: Buffer): Promise<number> {
+  async execute2(
+    args: string[],
+    intput: Buffer,
+    options: ExecuteOptions = {}
+  ): Promise<number> {
+    const defaultOptions = {silent: !core.isDebug()}
+    options = {...defaultOptions, ...options}
     return await exec.exec(
       'ssh',
       ['-t', `${Vm.user}@${this.ipAddress}`].concat(args),
-      {input: intput}
+      {input: intput, ...options}
     )
   }