From 85965fac7576bc6875a466c5e85346cbc650133c Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Mon, 9 Sep 2024 09:09:37 -0600 Subject: [PATCH] fix: improve CI check --- src/multi-stage-output.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/multi-stage-output.tsx b/src/multi-stage-output.tsx index 2000004..b386225 100644 --- a/src/multi-stage-output.tsx +++ b/src/multi-stage-output.tsx @@ -18,7 +18,7 @@ import {StageStatus, StageTracker} from './stage-tracker.js' import {readableTime} from './utils.js' function isTruthy(value: string | undefined): boolean { - return Boolean(value) && value !== '0' && value !== 'false' + return value !== '0' && value !== 'false' } /** @@ -33,14 +33,14 @@ function isTruthy(value: string | undefined): boolean { * @returns {boolean} True if CI mode should be used, false otherwise. */ function shouldUseCIMode(): boolean { - if (isTruthy(env.MSO_DISABLE_CI_MODE)) return false + if (env.MSO_DISABLE_CI_MODE && isTruthy(env.MSO_DISABLE_CI_MODE)) return false // Inspired by https://github.com/sindresorhus/is-in-ci if ( isTruthy(env.CI) && ('CI' in env || 'CONTINUOUS_INTEGRATION' in env || Object.keys(env).some((key) => key.startsWith('CI_'))) ) return true - if (isTruthy(env.DEBUG)) return true + if (env.DEBUG && isTruthy(env.DEBUG)) return true return false }