Remove fallback logic for GHES 2.22

github · Nov 23, 2022 · d8597f3 · d8597f3
1 parent 39fe7aa
commit d8597f3
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 110 deletions.
diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
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/lib/testing-utils.js b/lib/testing-utils.js
diff --git a/lib/testing-utils.js.map b/lib/testing-utils.js.map
diff --git a/src/actions-util.ts b/src/actions-util.ts
@@ -864,23 +864,6 @@ function isDependabotActor() {
   return process.env["GITHUB_ACTOR"] === "dependabot[bot]";
 }
 
-// Is the current action executing a local copy (i.e. we're running a workflow on the codeql-action repo itself)
-// as opposed to running a remote action (i.e. when another repo references us)
-export function isRunningLocalAction(): boolean {
-  const relativeScriptPath = getRelativeScriptPath();
-  return (
-    relativeScriptPath.startsWith("..") || path.isAbsolute(relativeScriptPath)
-  );
-}
-
-// Get the location where the action is running from.
-// This can be used to get the actions name or tell if we're running a local action.
-export function getRelativeScriptPath(): string {
-  const runnerTemp = getRequiredEnvParam("RUNNER_TEMP");
-  const actionsDirectory = path.join(path.dirname(runnerTemp), "_actions");
-  return path.relative(actionsDirectory, __filename);
-}
-
 // Reads the contents of GITHUB_EVENT_PATH as a JSON object
 function getWorkflowEvent(): any {
   const eventJsonFile = getRequiredEnvParam("GITHUB_EVENT_PATH");

diff --git a/src/codeql.test.ts b/src/codeql.test.ts
@@ -421,22 +421,6 @@ test("getExtraOptions throws for bad content", (t) => {
   );
 });
 
-test("getCodeQLActionRepository", (t) => {
-  const logger = getRunnerLogger(true);
-
-  initializeEnvironment("1.2.3");
-
-  // isRunningLocalAction() === true
-  delete process.env["GITHUB_ACTION_REPOSITORY"];
-  process.env["RUNNER_TEMP"] = path.dirname(__dirname);
-  const repoLocalRunner = codeql.getCodeQLActionRepository(logger);
-  t.deepEqual(repoLocalRunner, "github/codeql-action");
-
-  process.env["GITHUB_ACTION_REPOSITORY"] = "xxx/yyy";
-  const repoEnv = codeql.getCodeQLActionRepository(logger);
-  t.deepEqual(repoEnv, "xxx/yyy");
-});
-
 test("databaseInterpretResults() does not set --sarif-add-query-help for 2.7.0", async (t) => {
   const runnerConstructorStub = stubToolRunnerConstructor();
   const codeqlObject = await codeql.getCodeQLForTesting();