Skip to content

Commit 9bf78d1

Browse files
henrymercerCopilot
andcommitted
Use per-language bundles by default
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d9f196d4-6d15-44ca-bd01-cd022d57d2cc
1 parent 64e5c62 commit 9bf78d1

5 files changed

Lines changed: 83 additions & 146 deletions

File tree

‎lib/entry-points.js‎

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

‎src/per-language-bundles.test.ts‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import test from "ava";
22

33
import { ActionsEnvVars } from "./environment";
4-
import { Feature } from "./feature-flags";
54
import { BuiltInLanguage } from "./languages";
65
import {
76
getOtherLanguagePacksReason,
@@ -12,7 +11,6 @@ import {
1211
} from "./per-language-bundles";
1312
import { BundlePlatform } from "./platform";
1413
import {
15-
createFeatures,
1614
getRecordingLogger,
1715
getTestEnv,
1816
initAllState,
@@ -40,7 +38,6 @@ async function checkEligibility(
4038
env: getTestEnv({
4139
[ActionsEnvVars.RUNNER_ENVIRONMENT]: "github-hosted",
4240
}),
43-
features: createFeatures([Feature.PerLanguageBundles]),
4441
...stateOverrides,
4542
}),
4643
{ ...ELIGIBLE_OPTIONS, ...overrides },
@@ -145,27 +142,6 @@ test("getPerLanguageBundleLanguage requires a supported release version", async
145142
t.is(await checkEligibility({ cliVersion: "2.27.1" }), BuiltInLanguage.java);
146143
});
147144

148-
test("getPerLanguageBundleLanguage requires the feature flag", async (t) => {
149-
t.is(await checkEligibility({}, { features: createFeatures([]) }), undefined);
150-
});
151-
152-
test("getPerLanguageBundleLanguage explains a disabled feature before checking eligibility", async (t) => {
153-
const messages: LoggedMessage[] = [];
154-
const language = await getPerLanguageBundleLanguage(
155-
initAllState({
156-
features: createFeatures([]),
157-
logger: getRecordingLogger(messages, { logToConsole: false }),
158-
}),
159-
{ ...ELIGIBLE_OPTIONS, rawLanguages: undefined, cliVersion: undefined },
160-
);
161-
162-
t.is(language, undefined);
163-
t.deepEqual(
164-
messages.map((message) => message.message),
165-
["Not using a per-language CodeQL bundle since the feature is disabled."],
166-
);
167-
});
168-
169145
test("getPerLanguageBundleLanguage skips only the release version check for the latest nightly", async (t) => {
170146
const nightly = { isLatestNightly: true, cliVersion: undefined };
171147
t.is(await checkEligibility(nightly), BuiltInLanguage.java);
@@ -181,10 +157,6 @@ test("getPerLanguageBundleLanguage skips only the release version check for the
181157
]) {
182158
t.is(await checkEligibility({ ...nightly, ...overrides }), undefined);
183159
}
184-
t.is(
185-
await checkEligibility(nightly, { features: createFeatures([]) }),
186-
undefined,
187-
);
188160
t.is(
189161
await checkEligibility(nightly, {
190162
env: getTestEnv({ [ActionsEnvVars.RUNNER_ENVIRONMENT]: "self-hosted" }),

‎src/per-language-bundles.ts‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
QuerySpec,
1010
UserConfig,
1111
} from "./config/db-config";
12-
import { Feature } from "./feature-flags";
1312
import { RepositoryPropertyName } from "./feature-flags/properties";
1413
import { BuiltInLanguage, parseBuiltInLanguage } from "./languages";
1514
import { BundlePlatform } from "./platform";
@@ -139,14 +138,10 @@ export interface PerLanguageBundleOptions {
139138
}
140139

141140
/** Returns the eligible bundle language, or undefined for the combined bundle. */
142-
export async function getPerLanguageBundleLanguage(
143-
{
144-
env,
145-
features,
146-
logger,
147-
}: ActionState<["Logger", "ReadOnlyEnv", "FeatureFlags"]>,
141+
export function getPerLanguageBundleLanguage(
142+
{ env, logger }: ActionState<["Logger", "ReadOnlyEnv"]>,
148143
options: PerLanguageBundleOptions,
149-
): Promise<BuiltInLanguage | undefined> {
144+
): BuiltInLanguage | undefined {
150145
const {
151146
rawLanguages,
152147
otherLanguagePacksReason,
@@ -162,10 +157,6 @@ export async function getPerLanguageBundleLanguage(
162157
return undefined;
163158
};
164159

165-
if (!(await features.getValue(Feature.PerLanguageBundles))) {
166-
return explain("the feature is disabled");
167-
}
168-
169160
// A defined reason means the CodeQL CLI may need packs for other languages, for example because
170161
// of the configured queries. That applies whichever languages were requested, so check it first
171162
// to avoid suggesting that requesting a single language would be enough.

0 commit comments

Comments
 (0)