From 0865c4bfce7deea86ea9a5aebef018b997ab2a29 Mon Sep 17 00:00:00 2001 From: James Bradlee Date: Tue, 20 Aug 2024 17:48:27 +0200 Subject: [PATCH] must use `||` and not `??` when falling back to commit when ref is not provided. Signed-off-by: James Bradlee --- __test__/input-helper.test.ts | 6 ++---- dist/index.js | 3 +-- src/input-helper.ts | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/__test__/input-helper.test.ts b/__test__/input-helper.test.ts index 8fb4e21..99187b6 100644 --- a/__test__/input-helper.test.ts +++ b/__test__/input-helper.test.ts @@ -163,10 +163,8 @@ describe('input-helper tests', () => { inputs.commit = '0123456789012345678901234567890123456789' const settings: IGitSourceSettings = await inputHelper.getInputs() expect(settings).toBeTruthy() - expect(settings.ref).toBeTruthy() - expect(settings.ref).toStrictEqual( - '0123456789012345678901234567890123456789' - ) + expect(settings.ref).toBeFalsy() + expect(settings.ref).toStrictEqual('') expect(settings.commit).toBeTruthy() expect(settings.commit).toStrictEqual( '0123456789012345678901234567890123456789' diff --git a/dist/index.js b/dist/index.js index 9946771..06398b5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1717,7 +1717,6 @@ const path = __importStar(__nccwpck_require__(1017)); const workflowContextHelper = __importStar(__nccwpck_require__(9568)); function getInputs() { return __awaiter(this, void 0, void 0, function* () { - var _a; const result = {}; // GitHub workspace let githubWorkspacePath = process.env['GITHUB_WORKSPACE']; @@ -1753,7 +1752,7 @@ function getInputs() { if (result.commit && !result.commit.match(/^[0-9a-fA-F]{40}$/)) { throw new Error(`The commit SHA '${result.commit}' is not a valid SHA.`); } - result.ref = (_a = core.getInput('ref')) !== null && _a !== void 0 ? _a : result.commit; + result.ref = core.getInput('ref') || result.commit; if (!result.ref) { if (isWorkflowRepository) { result.ref = github.context.ref; diff --git a/src/input-helper.ts b/src/input-helper.ts index 768ae62..de64636 100644 --- a/src/input-helper.ts +++ b/src/input-helper.ts @@ -62,7 +62,7 @@ export async function getInputs(): Promise { throw new Error(`The commit SHA '${result.commit}' is not a valid SHA.`) } - result.ref = core.getInput('ref') ?? result.commit + result.ref = core.getInput('ref') || result.commit if (!result.ref) { if (isWorkflowRepository) { result.ref = github.context.ref