fix: option for agent, cleanup steps

Signed-off-by: Sam Gammon <[email protected]>
buildless · Dec 1, 2023 · e51979b · e51979b
1 parent 89c51f9
commit e51979b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -108,6 +108,7 @@ export function buildEffectiveOptions(options?: Partial<Options>): Options {
         arch: normalizeArch(
           stringOption(OptionName.ARCH, process.arch) as string
         ),
+        agent: booleanOption(OptionName.AGENT, true),
         export_path: booleanOption(OptionName.EXPORT_PATH, true),
         token: stringOption(OptionName.TOKEN, process.env.GITHUB_TOKEN),
         custom_url: stringOption(OptionName.CUSTOM_URL)
@@ -260,6 +261,7 @@ export async function install(options?: Partial<Options>): Promise<void> {
     }
 
     // mount outputs
+    core.saveState('buildlessBinpath', outputs.path)
     core.setOutput(ActionOutputName.PATH, outputs.path)
     core.setOutput(ActionOutputName.VERSION, version)
     core.info(`Buildless installed at version ${release.version.tag_name} 🎉`)
@@ -283,7 +285,8 @@ export async function postExecute(options?: Partial<Options>): Promise<void> {
   core.info(`Cleaning up Buildless Agent and resources...`)
   const agentPid = core.getState('agentPid')
   const activeAgent = await agentConfig(targetOs)
-  if (activeAgent) {
+  if (agentPid) {
+    setBinpath(core.getState('buildlessBinpath'))
     let errMessage = 'unknown'
     try {
       await agentStop()
@@ -293,7 +296,7 @@ export async function postExecute(options?: Partial<Options>): Promise<void> {
       )
       let killFailed = false
       try {
-        process.kill(activeAgent.pid)
+        process.kill(activeAgent?.pid || parseInt(agentPid, 10))
       } catch (err) {
         killFailed = true
         if (err instanceof Error) {