Skip to content

Separate CodeQL bundle resolution from installation #4145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrymercer merged 4 commits into from
Sep 17, 2026
Merged

Separate CodeQL bundle resolution from installation #4145

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1970c45
Separate CodeQL bundle resolution from installation
henrymercer Sep 15, 2026
f3e0c87
Clarify resolved bundle handling
henrymercer Sep 16, 2026
06f4ce7
Isolate bundle cleanup test environments
henrymercer Sep 17, 2026
41c04be
Use initAllState in bundle cleanup tests
henrymercer Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/setup-codeql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as sinon from "sinon";
import * as actionsUtil from "./actions-util";
import * as api from "./api-client";
import * as diagnostics from "./diagnostics";
import { ActionsEnvVars, EnvVar, getEnv, ReadOnlyEnv } from "./environment";
import { ActionsEnvVars, Env, EnvVar, ReadOnlyEnv } from "./environment";
import { Feature } from "./feature-flags";
import { getRunnerLogger } from "./logging";
import { getCacheRestoreKeyPrefix } from "./overlay/caching";
Expand Down Expand Up @@ -1096,7 +1096,9 @@ async function runDownloadCodeQL(
toolcacheRoot: string,
features: Feature[],
bundleVersion: string | undefined,
env: ReadOnlyEnv = getEnv(),
env = getTestEnv({
[ActionsEnvVars.RUNNER_TOOL_CACHE]: toolcacheRoot,
}),
): Promise<{
codeqlFolder: string;
cleanupDiagnostic: toolsDownload.ToolcacheCleanupResult | undefined;
Expand Down Expand Up @@ -1152,7 +1154,7 @@ async function testToolcacheCleanup(
}: {
features: Feature[];
runnerEnvironment: string | undefined;
setUp?: () => void;
setUp?: (env: Env) => void;
},
check: (context: {
cleanupDiagnostic: toolsDownload.ToolcacheCleanupResult | undefined;
Expand All @@ -1167,7 +1169,10 @@ async function testToolcacheCleanup(
} else {
process.env[ActionsEnvVars.RUNNER_ENVIRONMENT] = runnerEnvironment;
}
setUp?.();
const env = getTestEnv({
[ActionsEnvVars.RUNNER_TOOL_CACHE]: tmpDir,
});
setUp?.(env);
Comment thread
mbg marked this conversation as resolved.
Resolved

// The extraction of the bundle would normally create this directory.
const destinationDirectory = createToolcacheEntry(
Expand All @@ -1186,6 +1191,7 @@ async function testToolcacheCleanup(
tmpDir,
features,
CLEANUP_BUNDLE_VERSION,
env,
);

t.true(
Expand Down Expand Up @@ -1477,8 +1483,8 @@ test.serial(
{
features: [Feature.CleanupToolcacheBundles],
runnerEnvironment: "github-hosted",
setUp: () => {
process.env[EnvVar.HAS_SET_UP_CODEQL] = "true";
setUp: (env) => {
env.set(EnvVar.HAS_SET_UP_CODEQL, "true");
},
},
({ cleanupDiagnostic, destinationDirectory, staleDirectory }) => {
Expand Down