From 40336c3c67f3733798c96197af9e6dc04c33cca2 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 14 Sep 2021 06:38:58 -0500 Subject: [PATCH] fix: set runner temp for local runs --- src/utils/setup/setupBin.ts | 7 ++++++- src/utils/tests/test-helpers.ts | 8 ++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/utils/setup/setupBin.ts b/src/utils/setup/setupBin.ts index 09ec75c9..edfd82d3 100644 --- a/src/utils/setup/setupBin.ts +++ b/src/utils/setup/setupBin.ts @@ -3,6 +3,7 @@ import { addPath, group, startGroup, endGroup } from "@actions/core" import { join } from "path" import { existsSync } from "fs" import * as hasha from "hasha" +import { tmpdir } from "os" /** A type that describes a package */ export type PackageInfo = { @@ -24,6 +25,10 @@ export async function setupBin( version: string, getPackageInfo: (version: string, platform: NodeJS.Platform) => PackageInfo ): Promise { + const setupCppDir = process.env.SETUP_CPP_DIR ?? "~/setup_cpp" + process.env.RUNNER_TEMP = process.env.RUNNER_TEMP ?? tmpdir() + process.env.RUNNER_TOOL_CACHE = process.env.RUNNER_TOOL_CACH ?? join(setupCppDir, "ToolCache") + // Build artifact name const binName = process.platform === "win32" ? `${name}.exe` : name @@ -38,7 +43,7 @@ export async function setupBin( // Get an unique output directory name from the URL. const key: string = await hasha.async(url) - const workDir = join(process.env.SETUP_CPP_DIR ?? "~/setup_cpp", key) + const workDir = join(setupCppDir, key) /** The directory which the tool is installed to */ const binDir = join(workDir, extractedFolderName, binRelativeDir) diff --git a/src/utils/tests/test-helpers.ts b/src/utils/tests/test-helpers.ts index 86de0fa5..c28d48ec 100644 --- a/src/utils/tests/test-helpers.ts +++ b/src/utils/tests/test-helpers.ts @@ -7,16 +7,12 @@ export async function setupTmpDir(testName: string) { await io.rmRF(tempDirectory) await io.mkdirP(tempDirectory) - process.env.INPUT_DESTINATION = tempDirectory - process.env.GITHUB_WORKSPACE = tempDirectory - process.env.SETUP_CPP_DIR = path.join(tempDirectory, "temp", "setup-cpp") - process.env.RUNNER_TOOL_CACHE = path.join(tempDirectory, "tempToolCache") - + process.env.SETUP_CPP_DIR = tempDirectory return tempDirectory } export async function cleanupTmpDir(testName: string) { - if (process.env.SETUP_CPP_DIR != undefined) { + if (process.env.SETUP_CPP_DIR !== undefined) { const tempDirectory = path.join(process.env.SETUP_CPP_DIR, testName) try {