C++: Handle codeql_action_cpp_build_mode_none feature flag · github/codeql-action@efbdf00 · GitHub

github / codeql-action Public

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

• Code
• Issues 157
• Pull requests 32
• Actions
• Security and quality 2
• Insights

Additional navigation options

Commit efbdf00

Browse filesBrowse the repository at this point in the historyBrowse files

calumgrant

committed

C++: Handle codeql_action_cpp_build_mode_none feature flag

1 parent 467d7e6 commit efbdf00
Copy full SHA for efbdf00

6 files changed

+40-20Lines changed: 40 additions & 20 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • feature-flags.js.map
  • feature-flags.js
  • init-action.js.map
  • init-action.js
• src
  • feature-flags.ts
  • init-action.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/feature-flags.js‎

Copy file name to clipboardExpand all lines: lib/feature-flags.js

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

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

Collapse file

‎lib/feature-flags.js.map‎

Copy file name to clipboardExpand all lines: lib/feature-flags.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/init-action.js‎

Copy file name to clipboardExpand all lines: lib/init-action.js

+15Lines changed: 15 additions & 0 deletions

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

Collapse file

‎lib/init-action.js.map‎

Copy file name to clipboardExpand all lines: lib/init-action.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/feature-flags.ts‎

Copy file name to clipboardExpand all lines: src/feature-flags.ts

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

Original file line number	Diff line number	Diff line change
@@ -50,8 +50,7 @@ export interface FeatureEnablement {
50	50	export enum Feature {
51	51	ArtifactV4Upgrade = "artifact_v4_upgrade",
52	52	CleanupTrapCaches = "cleanup_trap_caches",
53		- CppBuildModeNoneDisabled = "cpp_build_mode_none_disabled",
54		- CppBuildModeNoneEnabled = "cpp_build_mode_none",
	53	+ CppBuildModeNone = "cpp_build_mode_none",
55	54	CppDependencyInstallation = "cpp_dependency_installation_enabled",
56	55	DiffInformedQueries = "diff_informed_queries",
57	56	DisableCsharpBuildless = "disable_csharp_buildless",
@@ -105,14 +104,9 @@ export const featureConfig: Record<
105	104	envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES",
106	105	minimumVersion: undefined,
107	106	},
108		- [Feature.CppBuildModeNoneDisabled]: {
	107	+ [Feature.CppBuildModeNone]: {
109	108	defaultValue: false,
110		- envVar: "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE_DISABLED",
111		- minimumVersion: undefined,
112		- },
113		- [Feature.CppBuildModeNoneEnabled]: {
114		- defaultValue: false,
115		- envVar: "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE_ENABLED",
	109	+ envVar: "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE",
116	110	minimumVersion: undefined,
117	111	},
118	112	[Feature.CppDependencyInstallation]: {

Collapse file

‎src/init-action.ts‎

Copy file name to clipboardExpand all lines: src/init-action.ts

+17Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -546,6 +546,23 @@ async function run() {
546	546	}
547	547	}
548	548
	549	+ // Set CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE
	550	+ if (config.languages.includes(Language.cpp)) {
	551	+ const bmn_var = "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE";
	552	+ if (process.env[bmn_var]) {
	553	+ logger.info("CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE is already set");
	554	+ }
	555	+ else if (await features.getValue(Feature.CppBuildModeNone, codeql))
	556	+ {
	557	+ logger.info("Enabling C++ build-mode: none");
	558	+ core.exportVariable(bmn_var, "true");
	559	+ }
	560	+ else {
	561	+ logger.info("Disabling C++ build-mode: none");
	562	+ core.exportVariable(bmn_var, "false");
	563	+ }
	564	+ }
	565	+
549	566	// For CLI versions <2.15.1, build tracing caused errors in MacOS ARM machines with
550	567	// System Integrity Protection (SIP) disabled.
551	568	if (

0 commit comments

Comments

0 (0)