From d3abd11c4f53a1504734659e9b298a5b7173c544 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 14 Sep 2021 05:11:42 -0500 Subject: [PATCH] fix: install everything into ~/setup_cpp --- src/utils/setup/setupBin.ts | 3 +-- src/utils/tests/test-helpers.ts | 14 ++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/utils/setup/setupBin.ts b/src/utils/setup/setupBin.ts index ae5b2e1e..09ec75c9 100644 --- a/src/utils/setup/setupBin.ts +++ b/src/utils/setup/setupBin.ts @@ -3,7 +3,6 @@ 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 = { @@ -39,7 +38,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.RUNNER_TEMP ?? tmpdir(), key) + const workDir = join(process.env.SETUP_CPP_DIR ?? "~/setup_cpp", 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 dde719f8..86de0fa5 100644 --- a/src/utils/tests/test-helpers.ts +++ b/src/utils/tests/test-helpers.ts @@ -9,18 +9,20 @@ export async function setupTmpDir(testName: string) { await io.mkdirP(tempDirectory) process.env.INPUT_DESTINATION = tempDirectory process.env.GITHUB_WORKSPACE = tempDirectory - process.env.RUNNER_TEMP = path.join(tempDirectory, "temp") + process.env.SETUP_CPP_DIR = path.join(tempDirectory, "temp", "setup-cpp") process.env.RUNNER_TOOL_CACHE = path.join(tempDirectory, "tempToolCache") return tempDirectory } export async function cleanupTmpDir(testName: string) { - const tempDirectory = path.join(tmpdir(), "setup-cpp", testName) + if (process.env.SETUP_CPP_DIR != undefined) { + const tempDirectory = path.join(process.env.SETUP_CPP_DIR, testName) - try { - await io.rmRF(tempDirectory) - } catch { - console.log("Failed to remove test directories") + try { + await io.rmRF(tempDirectory) + } catch { + console.log("Failed to remove test directories") + } } }