Merge pull request #594 from github/simon-engledew/fix-runner-temp-mi…

…ssing Restore original getCodeQLActionRepository behaviour
github · Jun 24, 2021 · db80a9a · db80a9a
2 parents 590c245 + af32a29
commit db80a9a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,7 @@
 
 ## [UNRELEASED]
 
-No user facing changes.
-
+- Fix `RUNNER_TEMP environment variable must be set` when using runner.
 ## 1.0.3 - 23 Jun 2021
 
 No user facing changes.

diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
diff --git a/lib/codeql.test.js.map b/lib/codeql.test.js.map
diff --git a/src/codeql.test.ts b/src/codeql.test.ts
@@ -374,11 +374,11 @@ test("getExtraOptions throws for bad content", (t) => {
 test("getCodeQLActionRepository", (t) => {
   const logger = getRunnerLogger(true);
 
-  initializeEnvironment(Mode.actions, "1.2.3");
+  initializeEnvironment(Mode.runner, "1.2.3");
   const repoActions = codeql.getCodeQLActionRepository(logger);
   t.deepEqual(repoActions, "github/codeql-action");
 
-  initializeEnvironment(Mode.runner, "1.2.3");
+  initializeEnvironment(Mode.actions, "1.2.3");
 
   // isRunningLocalAction() === true
   delete process.env["GITHUB_ACTION_REPOSITORY"];

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -175,7 +175,7 @@ function getCodeQLBundleName(): string {
 }
 
 export function getCodeQLActionRepository(logger: Logger): string {
-  if (util.isActions()) {
+  if (!util.isActions()) {
     return CODEQL_DEFAULT_ACTION_REPOSITORY;
   } else {
     return getActionsCodeQLActionRepository(logger);