Skip to content

Commit a333d64

Browse files
committed
Remove DatabaseInterpretResultsSupportsSarifRunProperty tools feature
This feature has been supported since CodeQL CLI v2.19.0
1 parent 97fb30d commit a333d64

11 files changed

Lines changed: 30 additions & 54 deletions

lib/analyze-action-post.js

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

lib/analyze-action.js

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

lib/autobuild-action.js

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

lib/init-action-post.js

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

lib/init-action.js

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

lib/resolve-environment-action.js

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

lib/setup-codeql-action.js

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

lib/upload-lib.js

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

lib/upload-sarif-action.js

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

src/codeql.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ async function getCodeQLForCmd(
853853
"--sarif-group-rules-by-pack",
854854
"--sarif-include-query-help=always",
855855
"--sublanguage-file-coverage",
856-
...(await getJobRunUuidSarifOptions(this)),
856+
...(await getJobRunUuidSarifOptions()),
857857
...getExtraOptionsFromEnv(["database", "interpret-results"]),
858858
];
859859
if (sarifRunPropertyFlag !== undefined) {
@@ -1283,13 +1283,8 @@ function applyAutobuildAzurePipelinesTimeoutFix() {
12831283
].join(" ");
12841284
}
12851285

1286-
async function getJobRunUuidSarifOptions(codeql: CodeQL) {
1286+
async function getJobRunUuidSarifOptions() {
12871287
const jobRunUuid = process.env[EnvVar.JOB_RUN_UUID];
12881288

1289-
return jobRunUuid &&
1290-
(await codeql.supportsFeature(
1291-
ToolsFeature.DatabaseInterpretResultsSupportsSarifRunProperty,
1292-
))
1293-
? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`]
1294-
: [];
1289+
return jobRunUuid ? [`--sarif-run-property=jobRunUuid=${jobRunUuid}`] : [];
12951290
}

0 commit comments

Comments
 (0)