Skip to content

Commit c1b620c

Browse files
committed
Allow initializeEnvironment to accept Env
1 parent 265d882 commit c1b620c

3 files changed

Lines changed: 20 additions & 17 deletions

File tree

‎lib/entry-points.js‎

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

‎src/setup/repository.test.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@ import * as sinon from "sinon";
55

66
import * as actionsUtil from "../actions-util";
77
import { ActionsEnvVars } from "../environment";
8-
import { callee, setupTests } from "../testing-utils";
8+
import { callee, getTestEnv, setupTests } from "../testing-utils";
99
import { initializeEnvironment } from "../util";
1010

1111
import { getCodeQLActionRepository } from "./repository";
1212

1313
setupTests(test);
1414

1515
test.serial("getCodeQLActionRepository", async (t) => {
16-
initializeEnvironment("1.2.3");
16+
const initialEnv = getTestEnv({
17+
[ActionsEnvVars.RUNNER_TEMP]: path.dirname(__dirname),
18+
});
19+
initializeEnvironment("1.2.3", initialEnv);
1720

1821
const target = callee(getCodeQLActionRepository)
1922
.withArgs()
20-
.withEnv((env) => {
21-
env.set(ActionsEnvVars.RUNNER_TEMP, path.dirname(__dirname));
22-
});
23+
.withEnv(initialEnv);
2324

2425
// isRunningLocalAction() === true
2526
await target.passes(t.deepEqual, "github/codeql-action");

‎src/util.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {
1919
getRequiredEnvParam,
2020
isInTestMode,
2121
exportEnvVar,
22+
getEnv,
23+
type Env,
2224
} from "./environment";
2325
import * as json from "./json";
2426
import { Language } from "./languages";
@@ -595,12 +597,12 @@ export function assertNever(value: never): never {
595597
* Set some initial environment variables that we can set even without
596598
* knowing what version of CodeQL we're running.
597599
*/
598-
export function initializeEnvironment(version: string) {
599-
exportEnvVar(EnvVar.FEATURE_MULTI_LANGUAGE, "false");
600-
exportEnvVar(EnvVar.FEATURE_SANDWICH, "false");
601-
exportEnvVar(EnvVar.FEATURE_SARIF_COMBINE, "true");
602-
exportEnvVar(EnvVar.FEATURE_WILL_UPLOAD, "true");
603-
exportEnvVar(EnvVar.VERSION, version);
600+
export function initializeEnvironment(version: string, env: Env = getEnv()) {
601+
env.export(EnvVar.FEATURE_MULTI_LANGUAGE, "false");
602+
env.export(EnvVar.FEATURE_SANDWICH, "false");
603+
env.export(EnvVar.FEATURE_SARIF_COMBINE, "true");
604+
env.export(EnvVar.FEATURE_WILL_UPLOAD, "true");
605+
env.export(EnvVar.VERSION, version);
604606
}
605607

606608
export class HTTPError extends Error {

0 commit comments

Comments
 (0)