robojerk/codeql-action

Address more comments from PR

Browse source
This commit is contained in:
Andrew Eisenberg 2023-08-29 13:20:55 -07:00
parent e603106d1a
commit 469786860d
6 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/actions-util.js generated
View file

@ -98,8 +98,7 @@ const getCommitOid = async function (checkoutPath, ref = "HEAD") {
"The checkout path provided to the action does not appear to be a git repository."); "The checkout path provided to the action does not appear to be a git repository.");
} }
else { else {
core.info(`Could not determine current commit SHA using git. Continuing with data from user input or environment. ` + core.info(`Could not determine current commit SHA using git. Continuing with data from user input or environment. ${stderr}`);
`Failed to call git to determine merge base. Continuing with data from environment: ${stderr}`);
} }
return (0, exports.getOptionalInput)("sha") || (0, util_1.getRequiredEnvParam)("GITHUB_SHA"); return (0, exports.getOptionalInput)("sha") || (0, util_1.getRequiredEnvParam)("GITHUB_SHA");
} }

2
lib/actions-util.js.map
View file

File diff suppressed because one or more lines are too long

16
lib/actions-util.test.js generated
View file

@ -224,22 +224,22 @@ const util_1 = require("./util");
infoStub.restore(); infoStub.restore();
}); });
(0, ava_1.default)("determineMergeBaseCommitOid no error", async (t) => { (0, ava_1.default)("determineMergeBaseCommitOid no error", async (t) => {
const stub = sinon.stub(core, "info"); const infoStub = sinon.stub(core, "info");
process.env["GITHUB_EVENT_NAME"] = "pull_request"; process.env["GITHUB_EVENT_NAME"] = "pull_request";
process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a"; process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a";
await actionsUtil.determineMergeBaseCommitOid(path.join(__dirname, "../..")); await actionsUtil.determineMergeBaseCommitOid(path.join(__dirname, "../.."));
t.deepEqual(1, stub.callCount); t.deepEqual(1, infoStub.callCount);
t.assert(stub.firstCall.args[0].startsWith("The checkout path provided to the action does not appear to be a git repository.")); t.assert(infoStub.firstCall.args[0].startsWith("The checkout path provided to the action does not appear to be a git repository."));
stub.restore(); infoStub.restore();
}); });
(0, ava_1.default)("determineMergeBaseCommitOid other error", async (t) => { (0, ava_1.default)("determineMergeBaseCommitOid other error", async (t) => {
const stub = sinon.stub(core, "info"); const infoStub = sinon.stub(core, "info");
process.env["GITHUB_EVENT_NAME"] = "pull_request"; process.env["GITHUB_EVENT_NAME"] = "pull_request";
process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a"; process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a";
const result = await actionsUtil.determineMergeBaseCommitOid(path.join(__dirname, "../../i-dont-exist")); const result = await actionsUtil.determineMergeBaseCommitOid(path.join(__dirname, "../../i-dont-exist"));
t.deepEqual(result, undefined); t.deepEqual(result, undefined);
t.deepEqual(1, stub.callCount); t.deepEqual(1, infoStub.callCount);
t.assert(stub.firstCall.args[0].startsWith("Failed to call git to determine merge base.")); t.assert(infoStub.firstCall.args[0].startsWith("Failed to call git to determine merge base."));
stub.restore(); infoStub.restore();
}); });
//# sourceMappingURL=actions-util.test.js.map //# sourceMappingURL=actions-util.test.js.map

2
lib/actions-util.test.js.map
View file

File diff suppressed because one or more lines are too long

16
src/actions-util.test.ts
View file

@ -282,23 +282,23 @@ test("determineMergeBaseCommitOid non-pullrequest", async (t) => {
}); });
test("determineMergeBaseCommitOid no error", async (t) => { test("determineMergeBaseCommitOid no error", async (t) => {
const stub = sinon.stub(core, "info"); const infoStub = sinon.stub(core, "info");
process.env["GITHUB_EVENT_NAME"] = "pull_request"; process.env["GITHUB_EVENT_NAME"] = "pull_request";
process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a"; process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a";
await actionsUtil.determineMergeBaseCommitOid(path.join(__dirname, "../..")); await actionsUtil.determineMergeBaseCommitOid(path.join(__dirname, "../.."));
t.deepEqual(1, stub.callCount); t.deepEqual(1, infoStub.callCount);
t.assert( t.assert(
stub.firstCall.args[0].startsWith( infoStub.firstCall.args[0].startsWith(
"The checkout path provided to the action does not appear to be a git repository.", "The checkout path provided to the action does not appear to be a git repository.",
), ),
); );
stub.restore(); infoStub.restore();
}); });
test("determineMergeBaseCommitOid other error", async (t) => { test("determineMergeBaseCommitOid other error", async (t) => {
const stub = sinon.stub(core, "info"); const infoStub = sinon.stub(core, "info");
process.env["GITHUB_EVENT_NAME"] = "pull_request"; process.env["GITHUB_EVENT_NAME"] = "pull_request";
process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a"; process.env["GITHUB_SHA"] = "100912429fab4cb230e66ffb11e738ac5194e73a";
@ -306,12 +306,12 @@ test("determineMergeBaseCommitOid other error", async (t) => {
path.join(__dirname, "../../i-dont-exist"), path.join(__dirname, "../../i-dont-exist"),
); );
t.deepEqual(result, undefined); t.deepEqual(result, undefined);
t.deepEqual(1, stub.callCount); t.deepEqual(1, infoStub.callCount);
t.assert( t.assert(
stub.firstCall.args[0].startsWith( infoStub.firstCall.args[0].startsWith(
"Failed to call git to determine merge base.", "Failed to call git to determine merge base.",
), ),
); );
stub.restore(); infoStub.restore();
}); });

3
src/actions-util.ts
View file

@ -91,8 +91,7 @@ export const getCommitOid = async function (
); );
} else { } else {
core.info( core.info(
`Could not determine current commit SHA using git. Continuing with data from user input or environment. ` + `Could not determine current commit SHA using git. Continuing with data from user input or environment. ${stderr}`,
`Failed to call git to determine merge base. Continuing with data from environment: ${stderr}`,
); );
} }