fix: exiting after completion

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

__tests__/index.test.ts

@@ -2,8 +2,12 @@ import * as main from '../src/main'
 import { setupCoreMocks } from './utils'
 
 const { clearMocks, resetState } = setupCoreMocks()
-const runMock = jest.spyOn(main, 'entry').mockImplementation(() => Promise.resolve())
-const cleanupMock = jest.spyOn(main, 'cleanup').mockImplementation(() => Promise.resolve())
+const runMock = jest
+  .spyOn(main, 'entry')
+  .mockImplementation(() => Promise.resolve())
+const cleanupMock = jest
+  .spyOn(main, 'cleanup')
+  .mockImplementation(() => Promise.resolve())
 
 describe('index', () => {
   afterEach(() => {

__tests__/main.test.ts

@@ -2,7 +2,15 @@ import { setupCoreMocks } from './utils'
 import * as main from '../src/main'
 import { ActionOutputName } from '../src/outputs'
 
-const { setupMocks, clearMocks, resetState, errorMock, getInputMock, setFailedMock, setOutputMock } = setupCoreMocks()
+const {
+  setupMocks,
+  clearMocks,
+  resetState,
+  errorMock,
+  getInputMock,
+  setFailedMock,
+  setOutputMock
+} = setupCoreMocks()
 const runMock = jest.spyOn(main, 'entry')
 
 describe('action entry', () => {

__tests__/utils.ts

@@ -75,26 +75,30 @@ export function resetState() {
 }
 
 export function setupCoreMocks(): {
-  debugMock: jest.SpyInstance,
-  errorMock: jest.SpyInstance,
-  getInputMock: jest.SpyInstance,
-  setFailedMock: jest.SpyInstance,
-  setOutputMock: jest.SpyInstance,
-  getJsonMock: jest.SpyInstance,
-  getOctokitMock: jest.SpyInstance,
-  execMock: jest.SpyInstance,
-  clearMocks: () => void,
-  setupMocks: () => void,
-  resetState: () => void,
+  debugMock: jest.SpyInstance
+  errorMock: jest.SpyInstance
+  getInputMock: jest.SpyInstance
+  setFailedMock: jest.SpyInstance
+  setOutputMock: jest.SpyInstance
+  getJsonMock: jest.SpyInstance
+  getOctokitMock: jest.SpyInstance
+  execMock: jest.SpyInstance
+  clearMocks: () => void
+  setupMocks: () => void
+  resetState: () => void
 } {
   let debugMock: jest.SpyInstance = jest.spyOn(core, 'debug')
   let errorMock: jest.SpyInstance = jest.spyOn(core, 'error')
   let getInputMock: jest.SpyInstance = jest.spyOn(core, 'getInput')
   let setFailedMock: jest.SpyInstance = jest.spyOn(core, 'setFailed')
   let setOutputMock: jest.SpyInstance = jest.spyOn(core, 'setOutput')
   let execMock: jest.SpyInstance = jest.spyOn(exec, 'exec')
-  let getOctokitMock: jest.SpyInstance = jest.spyOn(github, 'getOctokit').mockImplementation()
-  let getJsonMock: jest.SpyInstance = jest.spyOn(httpClient, 'getJson').mockImplementation()
+  let getOctokitMock: jest.SpyInstance = jest
+    .spyOn(github, 'getOctokit')
+    .mockImplementation()
+  let getJsonMock: jest.SpyInstance = jest
+    .spyOn(httpClient, 'getJson')
+    .mockImplementation()
 
   return {
     debugMock,
@@ -118,6 +122,6 @@ export function setupCoreMocks(): {
       getInputMock = jest.spyOn(core, 'getInput').mockImplementation()
       setFailedMock = jest.spyOn(core, 'setFailed').mockImplementation()
       setOutputMock = jest.spyOn(core, 'setOutput').mockImplementation()
-    },
+    }
   }
 }

package.json

@@ -27,7 +27,7 @@
     "build": "pnpm run bundle",
     "release": "pnpm run build && pnpm run sentry:sourcemaps",
     "bundle": "pnpm run format:write && pnpm run package",
-    "ci-test": "jest",
+    "ci-test": "jest --forceExit --coverage",
     "clean": "shx rm -fr dist src/gen",
     "gen": "test -d src/gen || buf generate --include-imports",
     "coverage": "make-coverage-badge --output-path ./badges/coverage.svg",
@@ -38,7 +38,8 @@
     "package:main": "ncc build src/index.ts --license licenses.txt --minify --source-map",
     "package:cleanup": "ncc build src/cleanup.ts -o dist/cleanup --minify --source-map",
     "package:watch": "pnpm run package -- --watch",
-    "test": "jest",
+    "test": "jest --runInBand --forceExit --no-watchman --coverage",
+    "test:debug": "jest --runInBand --detectOpenHandles",
     "all": "pnpm run format:write && pnpm run lint && pnpm run test && pnpm run coverage && pnpm run package",
     "commitlint": "commitlint --edit",
     "sentry:sourcemaps": "sentry-cli sourcemaps inject --org elide --project buildless-setup ./dist && sentry-cli sourcemaps upload --org elide --project buildless-setup ./dist"

src/diagnostics.ts

@@ -218,12 +218,14 @@ export async function error(err: Error | unknown, fatal = true): Promise<void> {
 /**
  * Exit hook for making sure Sentry finishes reporting.
  */
-export async function onExit(): Promise<void> {
+export async function onExit(exit: boolean): Promise<void> {
   core.debug('Closing resources')
   try {
     httpClient.dispose()
   } catch (err) {
     // Ignore.
   }
-  process.exit(0)
+  if (exit) {
+    process.exit(0)
+  }
 }

src/main.ts

@@ -484,7 +484,7 @@ export async function install(
       core.setOutput(ActionOutputName.PATH, outputs.path)
       core.setOutput(ActionOutputName.VERSION, outputs.version)
     }
-    core.info(`✅ Buildless installed at version ${outputs.version}.`)
+    core.info(`✅ Buildless installed at version '${outputs.version}'.`)
     if (agentEnabled) {
       if (agentManaged) {
         core.info(`✅ Buildless Agent installed and running.`)
@@ -586,7 +586,7 @@ export async function entry(options?: Partial<Options>): Promise<void> {
 
   try {
     await install(options || {}, true)
-    await onExit()
+    await onExit(process.env.RUNNER_ENVIRONMENT === 'github-hosted')
   } catch (err) {
     core.warning(
       'Buildless failed to install; this build may not be accelerated. Please see CI logs for more information.'
@@ -605,7 +605,7 @@ export async function cleanup(options?: Partial<Options>): Promise<void> {
   try {
     await postExecute(options)
     core.info(`Thanks for using Buildless. 🎉`)
-    await onExit()
+    await onExit(process.env.RUNNER_ENVIRONMENT === 'github-hosted')
   } catch (err) {
     core.notice(
       'Cleanup stage for the Buildless action failed. Please see CI logs for more information.'

src/releases.ts

@@ -446,7 +446,7 @@ export async function downloadRelease(
     // resolve applicable version
     let versionInfo: BuildlessVersionInfo
     if (options.version === 'latest') {
-      core.info('Resolving latest version via GitHub API')
+      core.info('Resolving latest version...')
       versionInfo = await resolveLatestVersion(options.token)
     } else {
       /* istanbul ignore next */