Merge branch 'main' into henrymercer/enable-features-on-ghes

This commit is contained in:
Henry Mercer
2023-10-26 19:47:56 +01:00
committed by GitHub
8 changed files with 107 additions and 25 deletions

View File

@@ -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");