Skip to content

Commit 582d08c

Browse files
committed
Explicitly set C/C++ trap caching env var to false
1 parent 60a0dce commit 582d08c

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

lib/init-action.js

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

src/config-utils.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,9 +1032,12 @@ async function setCppTrapCachingEnvironmentVariables(
10321032
logger.info(
10331033
`Environment variable ${envVar} already set, leaving it unchanged.`,
10341034
);
1035-
} else {
1036-
logger.info("Enabling CodeQL C++ TRAP caching support.");
1035+
} else if (config.trapCaches[KnownLanguage.cpp]) {
1036+
logger.info("Enabling TRAP caching for C/C++.");
10371037
core.exportVariable(envVar, "true");
1038+
} else {
1039+
logger.debug(`Disabling TRAP caching for C/C++.`);
1040+
core.exportVariable(envVar, "false");
10381041
}
10391042
}
10401043
}
@@ -1238,10 +1241,10 @@ export async function initConfig(
12381241
);
12391242
config.trapCaches = trapCaches;
12401243
config.trapCacheDownloadTime = trapCacheDownloadTime;
1241-
1242-
await setCppTrapCachingEnvironmentVariables(config, logger);
12431244
}
12441245

1246+
await setCppTrapCachingEnvironmentVariables(config, logger);
1247+
12451248
return config;
12461249
}
12471250

0 commit comments

Comments
 (0)