Skip to content

Commit 9200db3

Browse files
author
Simon Engledew
committed
Restore original getCodeQLActionRepository behaviour
1 parent ac402bf commit 9200db3

7 files changed

Lines changed: 15 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
## [UNRELEASED]
44

5-
No user facing changes.
6-
5+
- Fix `RUNNER_TEMP environment variable must be set` when using runner.
76
## 1.0.3 - 23 Jun 2021
87

98
No user facing changes.

lib/codeql.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.test.js

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

lib/codeql.test.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/codeql.test.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,19 +374,21 @@ test("getExtraOptions throws for bad content", (t) => {
374374
test("getCodeQLActionRepository", (t) => {
375375
const logger = getRunnerLogger(true);
376376

377+
process.env["RUNNER_TEMP"] = path.dirname(__dirname);
378+
377379
initializeEnvironment(Mode.actions, "1.2.3");
378380
const repoActions = codeql.getCodeQLActionRepository(logger);
379381
t.deepEqual(repoActions, "github/codeql-action");
380382

383+
process.env["GITHUB_ACTION_REPOSITORY"] = "xxx/yyy";
384+
const repoEnv = codeql.getCodeQLActionRepository(logger);
385+
t.deepEqual(repoEnv, "xxx/yyy");
386+
381387
initializeEnvironment(Mode.runner, "1.2.3");
382388

383389
// isRunningLocalAction() === true
384390
delete process.env["GITHUB_ACTION_REPOSITORY"];
385391
process.env["RUNNER_TEMP"] = path.dirname(__dirname);
386392
const repoLocalRunner = codeql.getCodeQLActionRepository(logger);
387393
t.deepEqual(repoLocalRunner, "github/codeql-action");
388-
389-
process.env["GITHUB_ACTION_REPOSITORY"] = "xxx/yyy";
390-
const repoEnv = codeql.getCodeQLActionRepository(logger);
391-
t.deepEqual(repoEnv, "xxx/yyy");
392394
});

src/codeql.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ function getCodeQLBundleName(): string {
175175
}
176176

177177
export function getCodeQLActionRepository(logger: Logger): string {
178-
if (util.isActions()) {
178+
if (!util.isActions()) {
179179
return CODEQL_DEFAULT_ACTION_REPOSITORY;
180180
} else {
181181
return getActionsCodeQLActionRepository(logger);

0 commit comments

Comments
 (0)