Merge pull request #998 from github/edoardo/no-download-pack · github/codeql-action@6e57bba · GitHub

github / codeql-action Public

• Notifications You must be signed in to change notification settings
• Fork 487
• Star 1.6k

• Code
• Issues 158
• Pull requests 35
• Actions
• Security and quality 2
• Insights

Additional navigation options

Commit 6e57bba

Browse filesBrowse the repository at this point in the historyBrowse files

edoardopirovano

authored

Merge pull request #998 from github/edoardo/no-download-pack

Don't download packs when it isn't needed

2 parents df16470 + 85cfdb2 commit 6e57bba
Copy full SHA for 6e57bba

6 files changed

+17-12Lines changed: 17 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • analyze.js.map
  • analyze.js
  • codeql.js.map
  • codeql.js
• src
  • analyze.ts
  • codeql.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/analyze.js‎

Copy file name to clipboardExpand all lines: lib/analyze.js

+3-2Lines changed: 3 additions & 2 deletions

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

Collapse file

‎lib/analyze.js.map‎

Copy file name to clipboardExpand all lines: lib/analyze.js.map

+1-1Lines changed: 1 addition & 1 deletion

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

Collapse file

‎lib/codeql.js‎

Copy file name to clipboardExpand all lines: lib/codeql.js

+5-5Lines changed: 5 additions & 5 deletions

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

Collapse file

‎lib/codeql.js.map‎

Copy file name to clipboardExpand all lines: lib/codeql.js.map

+1-1Lines changed: 1 addition & 1 deletion

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

Collapse file

‎src/analyze.ts‎

Copy file name to clipboardExpand all lines: src/analyze.ts

+6-2Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -6,6 +6,7 @@ import * as yaml from "js-yaml";
6	6
7	7	import * as analysisPaths from "./analysis-paths";
8	8	import {
	9	+ CODEQL_VERSION_CONFIG_FILES,
9	10	CODEQL_VERSION_COUNTS_LINES,
10	11	CODEQL_VERSION_NEW_TRACING,
11	12	getCodeQL,
@@ -235,12 +236,15 @@ export async function runQueries(
235	236	);
236	237	}
237	238
	239	+ const codeql = await getCodeQL(config.codeQLCmd);
238	240	try {
239		- if (hasPackWithCustomQueries) {
	241	+ if (
	242	+ hasPackWithCustomQueries &&
	243	+ !(await util.codeQlVersionAbove(codeql, CODEQL_VERSION_CONFIG_FILES))
	244	+ ) {
240	245	logger.info("Performing analysis with custom CodeQL Packs.");
241	246	logger.startGroup(`Downloading custom packs for ${language}`);
242	247
243		- const codeql = await getCodeQL(config.codeQLCmd);
244	248	const results = await codeql.packDownload(packsWithVersion);
245	249	logger.info(
246	250	`Downloaded packs: ${results.packs

Collapse file

‎src/codeql.ts‎

Copy file name to clipboardExpand all lines: src/codeql.ts

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -220,7 +220,7 @@ const CODEQL_VERSION_GROUP_RULES = "2.5.5";
220	220	const CODEQL_VERSION_SARIF_GROUP = "2.5.3";
221	221	export const CODEQL_VERSION_COUNTS_LINES = "2.6.2";
222	222	const CODEQL_VERSION_CUSTOM_QUERY_HELP = "2.7.1";
223		- const CODEQL_VERSION_CONFIG_FILES = "2.8.2"; // Versions before 2.8.2 weren't tolerant to unknown properties
	223	+ export const CODEQL_VERSION_CONFIG_FILES = "2.8.2"; // Versions before 2.8.2 weren't tolerant to unknown properties
224	224	export const CODEQL_VERSION_ML_POWERED_QUERIES = "2.7.5";
225	225
226	226	/**

0 commit comments

Comments

0 (0)