Merge branch 'main' into henrymercer/enable-features-on-ghes
This commit is contained in:
commit
e8e83c3a56
8 changed files with 107 additions and 25 deletions
|
|
@ -15,7 +15,7 @@ import * as api from "./api-client";
|
|||
import type { Config } from "./config-utils";
|
||||
import { EnvVar } from "./environment";
|
||||
import {
|
||||
CODEQL_VERSION_INTRA_LAYER_PARALLELISM,
|
||||
CODEQL_VERSION_FINE_GRAINED_PARALLELISM,
|
||||
CodeQLDefaultVersionInfo,
|
||||
Feature,
|
||||
FeatureEnablement,
|
||||
|
|
@ -858,7 +858,7 @@ export async function getCodeQLForCmd(
|
|||
}
|
||||
if (
|
||||
await features.getValue(
|
||||
Feature.EvaluatorIntraLayerParallelismEnabled,
|
||||
Feature.EvaluatorFineGrainedParallelismEnabled,
|
||||
this,
|
||||
)
|
||||
) {
|
||||
|
|
@ -866,7 +866,7 @@ export async function getCodeQLForCmd(
|
|||
} else if (
|
||||
await util.codeQlVersionAbove(
|
||||
this,
|
||||
CODEQL_VERSION_INTRA_LAYER_PARALLELISM,
|
||||
CODEQL_VERSION_FINE_GRAINED_PARALLELISM,
|
||||
)
|
||||
) {
|
||||
codeqlArgs.push("--no-intra-layer-parallelism");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue