Merge pull request #48 from aminya/deps [skip ci]

This commit is contained in:
Amin Yahyaabadi 2022-04-16 00:40:01 -07:00 committed by GitHub
commit 4680531e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 647 additions and 564 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

@ -15,7 +15,7 @@
"build": "run-p test.tsc build.parcel copy.matchers", "build": "run-p test.tsc build.parcel copy.matchers",
"build.docker": "pnpm build && docker build -f ./building/docker/ubuntu_node.dockerfile -t setup_cpp .", "build.docker": "pnpm build && docker build -f ./building/docker/ubuntu_node.dockerfile -t setup_cpp .",
"build.parcel": "cross-env NODE_ENV=production parcel build --detailed-report", "build.parcel": "cross-env NODE_ENV=production parcel build --detailed-report",
"bump": "ncu -u -x execa,prettier && pnpm update", "bump": "ncu -u -x execa && pnpm update",
"clean": "shx rm -rf .parcel-cache dist exe", "clean": "shx rm -rf .parcel-cache dist exe",
"copy.matchers": "shx cp ./src/gcc/gcc_matcher.json ./dist/ && shx cp ./src/msvc/msvc_matcher.json ./dist && shx cp ./src/python/python_matcher.json ./dist/ && shx cp ./src/llvm/llvm_matcher.json ./dist/ ", "copy.matchers": "shx cp ./src/gcc/gcc_matcher.json ./dist/ && shx cp ./src/msvc/msvc_matcher.json ./dist && shx cp ./src/python/python_matcher.json ./dist/ && shx cp ./src/llvm/llvm_matcher.json ./dist/ ",
"dev": "cross-env NODE_ENV=development parcel watch", "dev": "cross-env NODE_ENV=development parcel watch",
@ -40,7 +40,7 @@
"execa": "^5.1.1", "execa": "^5.1.1",
"mri": "^1.2.0", "mri": "^1.2.0",
"msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1", "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
"semver": "7.3.5", "semver": "7.3.7",
"setup-python": "github:actions/setup-python#7f80679172b057fc5e90d70d197929d454754a5a", "setup-python": "github:actions/setup-python#7f80679172b057fc5e90d70d197929d454754a5a",
"untildify": "^4.0.0", "untildify": "^4.0.0",
"which": "^2.0.2" "which": "^2.0.2"
@ -49,20 +49,20 @@
"@types/cross-spawn": "^6.0.2", "@types/cross-spawn": "^6.0.2",
"@types/jest": "^27.4.1", "@types/jest": "^27.4.1",
"@types/mri": "^1.1.1", "@types/mri": "^1.1.1",
"@types/node": "^17.0.23", "@types/node": "^17.0.24",
"@types/semver": "^7.3.9", "@types/semver": "^7.3.9",
"@types/which": "^2.0.1", "@types/which": "^2.0.1",
"caxa": "^2.1.0", "caxa": "^2.1.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cross-spawn": "^7.0.3", "cross-spawn": "^7.0.3",
"cspell": "^5.19.5", "cspell": "^5.19.7",
"eslint": "^8.12.0", "eslint": "^8.13.0",
"eslint-config-atomic": "^1.17.1", "eslint-config-atomic": "^1.17.1",
"jest": "^27.5.1", "jest": "^27.5.1",
"npm-check-updates": "^12.5.7", "npm-check-updates": "^12.5.9",
"npm-run-all2": "^5.0.2", "npm-run-all2": "^5.0.2",
"parcel": "^2.4.1", "parcel": "^2.4.1",
"prettier": "2.5.1", "prettier": "2.6.2",
"prettier-config-atomic": "^3.0.9", "prettier-config-atomic": "^3.0.9",
"shx": "0.3.4", "shx": "0.3.4",
"terser-config-atomic": "^0.1.1", "terser-config-atomic": "^0.1.1",
@ -93,9 +93,9 @@
], ],
"pnpm": { "pnpm": {
"overrides": { "overrides": {
"semver": "7.3.5", "semver": "7.3.7",
"eslint": "^8.12.0", "eslint": "^8.13.0",
"prettier": "2.5.1", "prettier": "2.6.2",
"core-js": "*", "core-js": "*",
"babel-eslint": "npm:@babel/eslint-parser" "babel-eslint": "npm:@babel/eslint-parser"
}, },

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@ import { setupBrewPack } from "../utils/setup/setupBrewPack"
import { setupChocoPack } from "../utils/setup/setupChocoPack" import { setupChocoPack } from "../utils/setup/setupChocoPack"
import { addBinExtension } from "../utils/extension/extension" import { addBinExtension } from "../utils/extension/extension"
import { extractTar } from "../utils/setup/extract" import { extractTar } from "../utils/setup/extract"
import { warning } from "../utils/io/io" import { info } from "../utils/io/io"
import { setupGraphviz } from "../graphviz/graphviz" import { setupGraphviz } from "../graphviz/graphviz"
import { getVersion } from "../default_versions" import { getVersion } from "../default_versions"
@ -47,7 +47,7 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
// doxygen on stable Ubuntu repositories is very old. So, we use get the binary from the website itself // doxygen on stable Ubuntu repositories is very old. So, we use get the binary from the website itself
installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch) installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch)
} catch (err) { } catch (err) {
warning(`Failed to download doxygen binary. ${err}. Falling back to apt-get.`) info(`Failed to download doxygen binary. ${err}. Falling back to apt-get.`)
installationInfo = await setupAptPack("doxygen", undefined) installationInfo = await setupAptPack("doxygen", undefined)
} }
await setupGraphviz(getVersion("graphviz", undefined), "", arch) await setupGraphviz(getVersion("graphviz", undefined), "", arch)

View File

@ -12,3 +12,7 @@ export function success(msg: string) {
export function warning(msg: string) { export function warning(msg: string) {
return isGitHubCI() ? core.warning(msg) : console.log(`\x1b[33m${msg}\x1b[0m`) return isGitHubCI() ? core.warning(msg) : console.log(`\x1b[33m${msg}\x1b[0m`)
} }
export function info(msg: string) {
return isGitHubCI() ? core.info(msg) : console.log(msg)
}