diff --git a/src/cmake/__tests__/cmake.test.ts b/src/cmake/__tests__/cmake.test.ts index df11c1d1..c0e6f375 100644 --- a/src/cmake/__tests__/cmake.test.ts +++ b/src/cmake/__tests__/cmake.test.ts @@ -1,6 +1,6 @@ import { setupCmake } from "../cmake" import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers" -import { isGitHubCI } from "../../utils/env/isci" +import { isGitHubCI } from "../../utils/env/isCI" import { getVersion } from "../../default_versions" jest.setTimeout(300000) diff --git a/src/gcc/gcc.ts b/src/gcc/gcc.ts index d4d1c887..a1045608 100644 --- a/src/gcc/gcc.ts +++ b/src/gcc/gcc.ts @@ -9,7 +9,7 @@ import semverCoerce from "semver/functions/coerce" import { setupMacOSSDK } from "../macos-sdk/macos-sdk" import path from "path" import { warning, info } from "../utils/io/io" -import { isGitHubCI } from "../utils/env/isci" +import { isGitHubCI } from "../utils/env/isCI" import { addBinExtension } from "../utils/extension/extension" import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin" import { extract7Zip } from "../utils/setup/extract" diff --git a/src/llvm/__tests__/llvm.test.ts b/src/llvm/__tests__/llvm.test.ts index 938e08ca..c5f2e002 100644 --- a/src/llvm/__tests__/llvm.test.ts +++ b/src/llvm/__tests__/llvm.test.ts @@ -2,7 +2,7 @@ import { setupLLVM, VERSIONS, getUrl, setupClangTools, getLinuxUrl } from "../ll import { getSpecificVersionAndUrl } from "../../utils/setup/version" import { isValidUrl } from "../../utils/http/validate_url" import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers" -import { isGitHubCI } from "../../utils/env/isci" +import { isGitHubCI } from "../../utils/env/isCI" import execa from "execa" import path from "path" import { addBinExtension } from "../../utils/extension/extension" diff --git a/src/llvm/llvm.ts b/src/llvm/llvm.ts index b16c35d7..d202a612 100644 --- a/src/llvm/llvm.ts +++ b/src/llvm/llvm.ts @@ -17,7 +17,7 @@ import { setOutput } from "@actions/core" import { setupAptPack, updateAptAlternatives } from "../utils/setup/setupAptPack" import { info, warning } from "../utils/io/io" import { existsSync } from "fs" -import { isGitHubCI } from "../utils/env/isci" +import { isGitHubCI } from "../utils/env/isCI" import { setupGcc } from "../gcc/gcc" import { getVersion } from "../default_versions" import { isArch } from "../utils/env/isArch" diff --git a/src/main.ts b/src/main.ts index 38287482..c5a818e9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,7 +17,7 @@ import { setupOpencppcoverage } from "./opencppcoverage/opencppcoverage" import { setupPython } from "./python/python" import mri from "mri" import { untildify_user as untildify } from "./utils/path/untildify" -import { isGitHubCI } from "./utils/env/isci" +import { isGitHubCI } from "./utils/env/isCI" import * as timeDelta from "time-delta" // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore diff --git a/src/msvc/msvc.ts b/src/msvc/msvc.ts index 314b8eca..d76101a6 100644 --- a/src/msvc/msvc.ts +++ b/src/msvc/msvc.ts @@ -3,7 +3,7 @@ import { setupVCVarsall } from "../vcvarsall/vcvarsall" // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import { vsversion_to_versionnumber, findVcvarsall } from "msvc-dev-cmd/lib.js" -import { isGitHubCI } from "../utils/env/isci" +import { isGitHubCI } from "../utils/env/isCI" import path from "path" import { existsSync } from "fs" import { error, info, warning } from "../utils/io/io" diff --git a/src/ninja/__tests__/ninja.test.ts b/src/ninja/__tests__/ninja.test.ts index e70a4ec9..a2fcb837 100644 --- a/src/ninja/__tests__/ninja.test.ts +++ b/src/ninja/__tests__/ninja.test.ts @@ -1,6 +1,6 @@ import { setupNinja } from "../ninja" import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers" -import { isGitHubCI } from "../../utils/env/isci" +import { isGitHubCI } from "../../utils/env/isCI" import { getVersion } from "../../default_versions" jest.setTimeout(300000) diff --git a/src/python/__tests__/python.test.ts b/src/python/__tests__/python.test.ts index abc5d575..7bec2e04 100644 --- a/src/python/__tests__/python.test.ts +++ b/src/python/__tests__/python.test.ts @@ -2,7 +2,7 @@ import { setupPython } from "../python" import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers" import { getVersion } from "../../default_versions" import { ubuntuVersion } from "../../utils/env/ubuntu_version" -import { isGitHubCI } from "../../utils/env/isci" +import { isGitHubCI } from "../../utils/env/isCI" import { info } from "../../utils/io/io" jest.setTimeout(300000) diff --git a/src/python/actions_python.ts b/src/python/actions_python.ts index c4005721..cac5d4e2 100644 --- a/src/python/actions_python.ts +++ b/src/python/actions_python.ts @@ -4,7 +4,7 @@ import { existsSync } from "fs" import { info, warning } from "../utils/io/io" import { debug } from "@actions/core" import path from "path" -import { isGitHubCI } from "../utils/env/isci" +import { isGitHubCI } from "../utils/env/isCI" import { isCacheFeatureAvailable, IS_LINUX, IS_WINDOWS } from "setup-python/src/utils" import { getCacheDistributor } from "setup-python/src/cache-distributions/cache-factory" diff --git a/src/python/python.ts b/src/python/python.ts index f66f0270..0e8df1d4 100644 --- a/src/python/python.ts +++ b/src/python/python.ts @@ -3,7 +3,7 @@ import { setupAptPack } from "../utils/setup/setupAptPack" import { setupPacmanPack } from "../utils/setup/setupPacmanPack" import { setupBrewPack } from "../utils/setup/setupBrewPack" import { setupChocoPack } from "../utils/setup/setupChocoPack" -import { isGitHubCI } from "../utils/env/isci" +import { isGitHubCI } from "../utils/env/isCI" import { warning, info } from "../utils/io/io" import { isArch } from "../utils/env/isArch" import which from "which" diff --git a/src/task/__tests__/task.test.ts b/src/task/__tests__/task.test.ts index 3807f48e..01f0b8a9 100644 --- a/src/task/__tests__/task.test.ts +++ b/src/task/__tests__/task.test.ts @@ -1,6 +1,6 @@ import { setupTask } from "../task" import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers" -import { isGitHubCI } from "../../utils/env/isci" +import { isGitHubCI } from "../../utils/env/isCI" import { getVersion } from "../../default_versions" jest.setTimeout(300000) diff --git a/src/utils/env/addEnv.ts b/src/utils/env/addEnv.ts index 9de5edf6..6f23736b 100644 --- a/src/utils/env/addEnv.ts +++ b/src/utils/env/addEnv.ts @@ -1,5 +1,5 @@ import { exportVariable, addPath as ghAddPath, info, setFailed } from "@actions/core" -import { isGitHubCI } from "./isci" +import { isGitHubCI } from "./isCI" import { untildify_user as untildify } from "../path/untildify" import { appendFileSync, existsSync, readFileSync } from "fs" import { error, warning } from "../io/io" diff --git a/src/utils/env/isci.ts b/src/utils/env/isCI.ts similarity index 100% rename from src/utils/env/isci.ts rename to src/utils/env/isCI.ts diff --git a/src/utils/io/io.ts b/src/utils/io/io.ts index 30b7c0cd..96583ea2 100644 --- a/src/utils/io/io.ts +++ b/src/utils/io/io.ts @@ -1,5 +1,5 @@ import * as core from "@actions/core" -import { isGitHubCI } from "../env/isci" +import { isGitHubCI } from "../env/isCI" export function error(err: string | Error) { return isGitHubCI() ? core.error(err) : console.log(`\x1b[31m${err}\x1b[0m`) diff --git a/src/utils/setup/setupAptPack.ts b/src/utils/setup/setupAptPack.ts index 7d1c7cb5..9eb6013e 100644 --- a/src/utils/setup/setupAptPack.ts +++ b/src/utils/setup/setupAptPack.ts @@ -3,7 +3,7 @@ import { InstallationInfo } from "./setupBin" import { execSudo } from "../exec/sudo" import { info } from "@actions/core" import { warning } from "../io/io" -import { isGitHubCI } from "../env/isci" +import { isGitHubCI } from "../env/isCI" import { cpprc_path, setupCppInProfile } from "../env/addEnv" import { appendFileSync } from "fs" diff --git a/src/utils/setup/setupBin.ts b/src/utils/setup/setupBin.ts index e78a05f0..29b31893 100644 --- a/src/utils/setup/setupBin.ts +++ b/src/utils/setup/setupBin.ts @@ -4,7 +4,7 @@ import { addPath } from "../env/addEnv" import { join } from "path" import { existsSync } from "fs" import { tmpdir } from "os" -import { isGitHubCI } from "../env/isci" +import { isGitHubCI } from "../env/isCI" import { setupAptPack } from "./setupAptPack" import { setupPacmanPack } from "./setupPacmanPack" import { isArch } from "../env/isArch"