fix: untildify the installation path

This commit is contained in:
Amin Yahyaabadi 2021-09-17 13:54:30 -05:00
parent 21b816c605
commit 801ebf86b8
5 changed files with 12 additions and 3 deletions

2
dist/setup_cpp.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -44,6 +44,7 @@
"hasha": "^5.2.2", "hasha": "^5.2.2",
"mri": "^1.2.0", "mri": "^1.2.0",
"semver": "^7.3.5", "semver": "^7.3.5",
"untildify": "^4.0.0",
"which": "^2.0.2" "which": "^2.0.2"
}, },
"pnpm": { "pnpm": {

View File

@ -32,6 +32,7 @@ importers:
terser-config-atomic: ^0.1.1 terser-config-atomic: ^0.1.1
ts-jest: ^27.0.5 ts-jest: ^27.0.5
typescript: ^4.4.3 typescript: ^4.4.3
untildify: ^4.0.0
which: ^2.0.2 which: ^2.0.2
dependencies: dependencies:
'@actions/core': 1.5.0 '@actions/core': 1.5.0
@ -41,6 +42,7 @@ importers:
hasha: 5.2.2 hasha: 5.2.2
mri: 1.2.0 mri: 1.2.0
semver: 7.3.5 semver: 7.3.5
untildify: 4.0.0
which: 2.0.2 which: 2.0.2
devDependencies: devDependencies:
'@types/cross-spawn': 6.0.2 '@types/cross-spawn': 6.0.2
@ -8431,6 +8433,11 @@ packages:
isobject: 3.0.1 isobject: 3.0.1
dev: true dev: true
/untildify/4.0.0:
resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
engines: {node: '>=8'}
dev: false
/uri-js/4.4.1: /uri-js/4.4.1:
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
dependencies: dependencies:

View File

@ -14,6 +14,7 @@ import { setupNinja } from "./ninja/ninja"
import { setupOpencppcoverage } from "./opencppcoverage/opencppcoverage" import { setupOpencppcoverage } from "./opencppcoverage/opencppcoverage"
import { setupPython } from "./python/python" import { setupPython } from "./python/python"
import mri from "mri" import mri from "mri"
import untildify from "untildify"
import semverValid from "semver/functions/valid" import semverValid from "semver/functions/valid"
import { getVersion } from "./default_versions" import { getVersion } from "./default_versions"
@ -83,7 +84,7 @@ export async function main(args: string[]): Promise<number> {
const arch = opts.architecture ?? process.arch const arch = opts.architecture ?? process.arch
// the installation dir for the tools that are downloaded directly // the installation dir for the tools that are downloaded directly
const setupCppDir = process.env.SETUP_CPP_DIR ?? "~/setup_cpp" const setupCppDir = process.env.SETUP_CPP_DIR ?? untildify("~/setup_cpp")
// report messages // report messages
const successMessages: string[] = [] const successMessages: string[] = []