Skip to content

Commit e5048f5

Browse files
committed
Tweak a couple of log messages
1 parent 06361b4 commit e5048f5

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

lib/setup-codeql.js

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/setup-codeql.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/setup-codeql.test.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/setup-codeql.test.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/setup-codeql.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ test("getCodeQLSource correctly returns bundled CLI version when tools == latest
141141

142142
// Afterwards, ensure that we see the deprecation message in the log.
143143
const expected_message: string =
144-
"`tools: latest` has been renamed to `tools: linked`, but the old name is still supported for now. No action is required.";
144+
"`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required.";
145145
t.assert(
146146
loggedMessages.some(
147147
(msg) =>

src/setup-codeql.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,12 @@ export async function getCodeQLSource(
274274
toolsInput && CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput);
275275
if (forceShippedTools) {
276276
logger.info(
277-
`Overriding the version of the CodeQL tools by ${defaultCliVersion.cliVersion}, the version shipped with the Action since ` +
278-
`tools: ${toolsInput} was requested.`,
277+
`'tools: ${toolsInput}' was requested, so using CodeQL version ${defaultCliVersion.cliVersion}, the version shipped with the Action.`,
279278
);
280279

281280
if (toolsInput === "latest") {
282281
logger.warning(
283-
"`tools: latest` has been renamed to `tools: linked`, but the old name is still supported for now. No action is required.",
282+
"`tools: latest` has been renamed to `tools: linked`, but the old name is still supported. No action is required.",
284283
);
285284
}
286285
}

0 commit comments

Comments
 (0)