Skip to content

Commit

Permalink
Differentiate setupCodeql.setupCodeQL from codeql.setupCodeQL
Browse files Browse the repository at this point in the history
  • Loading branch information
henrymercer committed Jan 11, 2023
1 parent d8b5f79 commit a9eb86f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion lib/codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.js.map

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions lib/setup-codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/setup-codeql.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/codeql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ export async function setupCodeQL(
checkVersion: boolean
): Promise<{ codeql: CodeQL; toolsVersion: string }> {
try {
const { codeqlFolder, toolsVersion } = await setupCodeql.setupCodeQL(
const { codeqlFolder, toolsVersion } = await setupCodeql.setupCodeQLBundle(
toolsInput,
apiDetails,
tempDir,
Expand Down
6 changes: 3 additions & 3 deletions src/setup-codeql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ export function getCodeQLURLVersion(url: string): string {
}

/**
* Set up CodeQL CLI access.
* Obtains the CodeQL bundle, installs it in the toolcache if appropriate, and extracts it.
*
* @param toolsInput
* @param apiDetails
Expand All @@ -457,9 +457,9 @@ export function getCodeQLURLVersion(url: string): string {
* @param logger
* @param checkVersion Whether to check that CodeQL CLI meets the minimum
* version requirement. Must be set to true outside tests.
* @returns a { CodeQL, toolsVersion } object.
* @returns the path to the extracted bundle, and the version of the tools
*/
export async function setupCodeQL(
export async function setupCodeQLBundle(
toolsInput: string | undefined,
apiDetails: api.GitHubApiDetails,
tempDir: string,
Expand Down

0 comments on commit a9eb86f

Please sign in to comment.