actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from aminya/patha [skip ci]

This commit is contained in:
Amin Yahyaabadi 2022-08-26 00:43:46 -07:00 committed by GitHub
parent 37a476edd1 2c6bfca888
commit 8e3dedf952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 232 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cspell.config.yaml
View File

@ -58,6 +58,7 @@ words:
- npmrc - npmrc
- Opencppcoverage - Opencppcoverage
- OSSDK - OSSDK
- patha
- pnpm - pnpm
- pwsh - pwsh
- pypy - pypy

2
dist/actions_python.08b116bb.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/actions_python.08b116bb.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
dist/actions_python.c6a6efec.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/actions_python.c6a6efec.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

9
package.json
View File

@ -59,11 +59,11 @@
"escape-path-with-spaces": "github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3", "escape-path-with-spaces": "github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3",
"exec-powershell": "workspace:1.0.0", "exec-powershell": "workspace:1.0.0",
"execa": "^5.1.1", "execa": "^5.1.1",
"extension-tools": "workspace:1.0.0",
"is-url-online": "^1.5.0", "is-url-online": "^1.5.0",
"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",
"numerous": "1.0.3", "numerous": "1.0.3",
"patha": "^0.4.0",
"root-tools": "workspace:1.0.0", "root-tools": "workspace:1.0.0",
"semver": "7.3.7", "semver": "7.3.7",
"setup-python": "github:actions/setup-python#c474c82340438924daab9282d07300bfe7e3692d", "setup-python": "github:actions/setup-python#c474c82340438924daab9282d07300bfe7e3692d",
@ -77,13 +77,13 @@
"@types/cross-spawn": "^6.0.2", "@types/cross-spawn": "^6.0.2",
"@types/jest": "^28.1.7", "@types/jest": "^28.1.7",
"@types/mri": "^1.1.1", "@types/mri": "^1.1.1",
"@types/node": "^18.7.6", "@types/node": "^18.7.9",
"@types/semver": "^7.3.12", "@types/semver": "^7.3.12",
"@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": "^6.7.0", "cspell": "^6.8.0",
"eslint": "^8.22.0", "eslint": "^8.22.0",
"eslint-config-atomic": "^1.18.1", "eslint-config-atomic": "^1.18.1",
"gen-readme": "^1.6.0", "gen-readme": "^1.6.0",
@ -124,7 +124,8 @@
"meson" "meson"
], ],
"alias": { "alias": {
"electron": false "electron": false,
"patha": "patha/dist/index.node.mjs"
}, },
"pnpm": { "pnpm": {
"overrides": { "overrides": {

66
packages/extension-tools/README.md
View File

@ -1,66 +0,0 @@
<h1 align="center">extension-tools</h1>
<p>
<a href="https://www.npmjs.com/package/extension-tools" target="_blank">
<img alt="Version" src="https://img.shields.io/npm/v/extension-tools.svg">
</a>
<a href="#" target="_blank">
<img alt="License: Apache--2.0" src="https://img.shields.io/badge/License-Apache--2.0-yellow.svg" />
</a>
</p>
> Tools for working with file extensions such as getting the binary and shell extension on different platforms.
## Install
```sh
npm install --save extension-tools
```
## Usage
<!-- INSERT GENERATED DOCS START -->
### `addBinExtension` (function)
Add bin extension to the given binary name.
**Parameters:**
- name (`string`) - The name you want to add the shell extension to
- win_ext (`string`) - `.exe` on Windows
- unix_ext (`string`) - `""` On unix.
**returns:** string
### `addShellExtension` (function)
Add native shell extension to the given name
**Parameters:**
- name (`string`) - The name you want to add the shell extension to
- win_ext (`string`) - `.bat` on Windows
- unix_ext (`string`) - `.sh` On unix.
**returns:** string
### `addShellHere` (function)
Prefix a `./` for unix shell and nothing for the cmd shell
**Parameters:**
- name (`string`)
**returns:** string
<!-- INSERT GENERATED DOCS END -->
## 🤝 Contributing
You can sponsor my work here:
https://github.com/sponsors/aminya
Pull requests, issues and feature requests are welcome.
See the [Contributing guide](https://github.com/aminya/setup-cpp/blob/master/CONTRIBUTING.md).

33
packages/extension-tools/package.json
View File

@ -1,33 +0,0 @@
{
"name": "extension-tools",
"version": "1.0.0",
"description": "Tools for working with file extensions such as getting the binary and shell extension on different platforms.",
"homepage": "https://github.com/aminya/setup-cpp",
"license": "Apache-2.0",
"author": "Amin Yahyaabadi",
"main": "./dist/index.js",
"source": "./src/index.ts",
"scripts": {
"build": "tsc"
},
"keywords": [
"extension",
"shell",
"bin",
"windows",
"sh",
"cmd",
"bat",
"exec",
"execa",
"spawn",
"system",
"unix",
"linux",
"github-actions",
"github",
"actions",
"gitlab",
"ci"
]
}

35
packages/extension-tools/src/index.ts
View File

@ -1,35 +0,0 @@
/**
* Add bin extension to the given binary name.
*
* @param name The name you want to add the shell extension to
* @param win_ext `.exe` on Windows
* @param unix_ext `""` On unix.
*/
export function addBinExtension(name: string, win_ext = ".exe", unix_ext = "") {
if (process.platform === "win32") {
return `${name}${win_ext}`
}
return `${name}${unix_ext}`
}
/**
* Add native shell extension to the given name
*
* @param name The name you want to add the shell extension to
* @param win_ext `.bat` on Windows
* @param unix_ext `.sh` On unix.
*/
export function addShellExtension(name: string, win_ext = ".bat", unix_ext = ".sh") {
if (process.platform === "win32") {
return `${name}${win_ext}`
}
return `${name}${unix_ext}`
}
/** Prefix a `./` for unix shell and nothing for the cmd shell */
export function addShellHere(name: string) {
if (process.platform === "win32") {
return name
}
return `./${name}`
}

7
packages/extension-tools/tsconfig.json
View File

@ -1,7 +0,0 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "./dist"
},
"include": ["./src"]
}

303
pnpm-lock.yaml
View File

@ -20,20 +20,19 @@ importers:
'@types/cross-spawn': ^6.0.2 '@types/cross-spawn': ^6.0.2
'@types/jest': ^28.1.7 '@types/jest': ^28.1.7
'@types/mri': ^1.1.1 '@types/mri': ^1.1.1
'@types/node': ^18.7.6 '@types/node': ^18.7.9
'@types/semver': ^7.3.12 '@types/semver': ^7.3.12
'@types/which': ^2.0.1 '@types/which': ^2.0.1
caxa: ^2.1.0 caxa: ^2.1.0
ci-log: workspace:1.0.0 ci-log: workspace:1.0.0
cross-env: 7.0.3 cross-env: 7.0.3
cross-spawn: ^7.0.3 cross-spawn: ^7.0.3
cspell: ^6.7.0 cspell: ^6.8.0
escape-path-with-spaces: github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3 escape-path-with-spaces: github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3
eslint: ^8.22.0 eslint: ^8.22.0
eslint-config-atomic: ^1.18.1 eslint-config-atomic: ^1.18.1
exec-powershell: workspace:1.0.0 exec-powershell: workspace:1.0.0
execa: ^5.1.1 execa: ^5.1.1
extension-tools: workspace:1.0.0
gen-readme: ^1.6.0 gen-readme: ^1.6.0
is-url-online: ^1.5.0 is-url-online: ^1.5.0
jest: ^28.1.3 jest: ^28.1.3
@ -44,6 +43,7 @@ importers:
npm-run-all2: ^6.0.2 npm-run-all2: ^6.0.2
numerous: 1.0.3 numerous: 1.0.3
parcel: 2.7.0 parcel: 2.7.0
patha: ^0.4.0
prettier: 2.7.1 prettier: 2.7.1
prettier-config-atomic: ^3.0.10 prettier-config-atomic: ^3.0.10
readme-md-generator: ^1.0.0 readme-md-generator: ^1.0.0
@ -70,11 +70,11 @@ importers:
escape-path-with-spaces: github.com/aminya/escape-path-with-spaces/d9f81ee649203ddc55783a2f96ada59df06118e3 escape-path-with-spaces: github.com/aminya/escape-path-with-spaces/d9f81ee649203ddc55783a2f96ada59df06118e3
exec-powershell: link:packages/exec-powershell exec-powershell: link:packages/exec-powershell
execa: 5.1.1 execa: 5.1.1
extension-tools: link:packages/extension-tools
is-url-online: 1.5.0 is-url-online: 1.5.0
mri: 1.2.0 mri: 1.2.0
msvc-dev-cmd: github.com/aminya/msvc-dev-cmd/9f672c1 msvc-dev-cmd: github.com/aminya/msvc-dev-cmd/9f672c1
numerous: 1.0.3 numerous: 1.0.3
patha: 0.4.0
root-tools: link:packages/root-tools root-tools: link:packages/root-tools
semver: 7.3.7 semver: 7.3.7
setup-python: github.com/actions/setup-python/c474c82340438924daab9282d07300bfe7e3692d setup-python: github.com/actions/setup-python/c474c82340438924daab9282d07300bfe7e3692d
@ -87,17 +87,17 @@ importers:
'@types/cross-spawn': 6.0.2 '@types/cross-spawn': 6.0.2
'@types/jest': 28.1.7 '@types/jest': 28.1.7
'@types/mri': 1.1.1 '@types/mri': 1.1.1
'@types/node': 18.7.6 '@types/node': 18.7.9
'@types/semver': 7.3.12 '@types/semver': 7.3.12
'@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: 6.7.0 cspell: 6.8.0
eslint: 8.22.0 eslint: 8.22.0
eslint-config-atomic: 1.18.1 eslint-config-atomic: 1.18.1
gen-readme: 1.6.0 gen-readme: 1.6.0
jest: 28.1.3_@types+node@18.7.6 jest: 28.1.3_@types+node@18.7.9
loose-ts-check: 1.2.0 loose-ts-check: 1.2.0
npm-check-updates: 16.0.5 npm-check-updates: 16.0.5
npm-run-all2: 6.0.2 npm-run-all2: 6.0.2
@ -130,9 +130,6 @@ importers:
devDependencies: devDependencies:
'@types/which': 2.0.1 '@types/which': 2.0.1
packages/extension-tools:
specifiers: {}
packages/root-tools: packages/root-tools:
specifiers: specifiers:
'@types/which': ^2.0.1 '@types/which': ^2.0.1
@ -732,8 +729,8 @@ packages:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true dev: true
/@cspell/cspell-bundled-dicts/6.7.0: /@cspell/cspell-bundled-dicts/6.8.0:
resolution: {integrity: sha512-PrN1riHfRBPMPv2oCiNwv9YAUjeyvhYFWgJuY5cE/GWtTcrCmcqjbBJQcAiJd0qQ8hm/cgPdKqOkMtWkm5beTQ==} resolution: {integrity: sha512-a+J/5M45RUmDiVmzQm8WacZCQxmIq0PK5rgkDE3iWyyIQWPwSK1+C37+85lZoDJ66il4YJpF0jutYKEJNfTCWw==}
engines: {node: '>=14'} engines: {node: '>=14'}
dependencies: dependencies:
'@cspell/dict-ada': 2.0.1 '@cspell/dict-ada': 2.0.1
@ -750,14 +747,14 @@ packages:
'@cspell/dict-dotnet': 2.0.1 '@cspell/dict-dotnet': 2.0.1
'@cspell/dict-elixir': 2.0.1 '@cspell/dict-elixir': 2.0.1
'@cspell/dict-en-gb': 1.1.33 '@cspell/dict-en-gb': 1.1.33
'@cspell/dict-en_us': 2.3.1 '@cspell/dict-en_us': 2.3.2
'@cspell/dict-filetypes': 2.1.1 '@cspell/dict-filetypes': 2.1.1
'@cspell/dict-fonts': 2.0.1 '@cspell/dict-fonts': 2.0.1
'@cspell/dict-fullstack': 2.0.6 '@cspell/dict-fullstack': 2.0.6
'@cspell/dict-git': 1.0.1 '@cspell/dict-git': 1.0.1
'@cspell/dict-golang': 3.0.1 '@cspell/dict-golang': 3.0.1
'@cspell/dict-haskell': 2.0.1 '@cspell/dict-haskell': 2.0.1
'@cspell/dict-html': 3.0.4 '@cspell/dict-html': 3.1.0
'@cspell/dict-html-symbol-entities': 3.0.0 '@cspell/dict-html-symbol-entities': 3.0.0
'@cspell/dict-java': 3.0.7 '@cspell/dict-java': 3.0.7
'@cspell/dict-latex': 2.0.9 '@cspell/dict-latex': 2.0.9
@ -773,25 +770,25 @@ packages:
'@cspell/dict-ruby': 2.0.2 '@cspell/dict-ruby': 2.0.2
'@cspell/dict-rust': 2.0.1 '@cspell/dict-rust': 2.0.1
'@cspell/dict-scala': 2.0.0 '@cspell/dict-scala': 2.0.0
'@cspell/dict-software-terms': 2.2.2 '@cspell/dict-software-terms': 2.2.3
'@cspell/dict-sql': 1.0.4 '@cspell/dict-sql': 1.0.4
'@cspell/dict-swift': 1.0.3 '@cspell/dict-swift': 1.0.3
'@cspell/dict-typescript': 2.0.1 '@cspell/dict-typescript': 2.0.1
'@cspell/dict-vue': 2.0.2 '@cspell/dict-vue': 2.0.2
dev: true dev: true
/@cspell/cspell-pipe/6.7.0: /@cspell/cspell-pipe/6.8.0:
resolution: {integrity: sha512-IpcKK/pRiFasMduf1Cuz20RD0ut+y74msNvDxs/mXBgx0LikVXnt1IF2b/L5j68KNdJqrNc8Uw3pte9fzrn8ZQ==} resolution: {integrity: sha512-V+GOhpd99Vsa3W30p3jyJ4qNTwEBA04POINT4XZKjuNZ5NLbBO3wARX8cCaVaPB/aJTbaB6rqvXnfTx5h47N0g==}
engines: {node: '>=14'} engines: {node: '>=14'}
dev: true dev: true
/@cspell/cspell-service-bus/6.7.0: /@cspell/cspell-service-bus/6.8.0:
resolution: {integrity: sha512-oCqIbh56mvUNcw4eX2wEXl5c3AIo8T9NM5byxP3uNswn9+1d49Zqpp0EJ4Qy71Lr94/E9uDR1bgDoK5F3nlC3g==} resolution: {integrity: sha512-+3uHHhy1jP+ZYhoDlIbAR5sp6kTlbLctvpPne9KEOFB5Vtnn2a0jfop7Xyfg+BQnEFU/gifoS87sofULBngAxQ==}
engines: {node: '>=14'} engines: {node: '>=14'}
dev: true dev: true
/@cspell/cspell-types/6.7.0: /@cspell/cspell-types/6.8.0:
resolution: {integrity: sha512-oZ46iL2/Sgb1tFhxF6FmVMpiK3jhN6IUQzTD96EZ6RN/bWP+D+iC1qmVruYoYc3hSaD8vJKd7lCisdgBKsFmiA==} resolution: {integrity: sha512-5hYe1wXHphVAWaQROJVs67AFMpYW9qNXiNKWdBZ6/l85x5ORcGYBtuxbBjdwzTSCmO6bNGVjYx14gxjQDYLlfQ==}
engines: {node: '>=14'} engines: {node: '>=14'}
dev: true dev: true
@ -851,8 +848,8 @@ packages:
resolution: {integrity: sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==} resolution: {integrity: sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==}
dev: true dev: true
/@cspell/dict-en_us/2.3.1: /@cspell/dict-en_us/2.3.2:
resolution: {integrity: sha512-mpjMY9Fo+cvt+BeL8bsoy8xpKhnILT0j6ith9OlYALELx8uPFyzSgFhkPBGam6jE8luG1XFsIsc0APQ7yzwhKw==} resolution: {integrity: sha512-/jkx3Lwig34nDP8zMEP8IF7Nkni4ac63FlAeK/B4yvriaz7Pqe5XbwU20otlB+y+T0nf5GxvWacIEyTFnV9BKg==}
dev: true dev: true
/@cspell/dict-filetypes/2.1.1: /@cspell/dict-filetypes/2.1.1:
@ -883,8 +880,8 @@ packages:
resolution: {integrity: sha512-04K7cPTcbYXmHICfiob4gZA1yaj4hpfM+Nl5WIJ1EAZsSGHdqmGEF28GuCjyQ8ZeKiJAsPt/vXuLBbjxkHqZyQ==} resolution: {integrity: sha512-04K7cPTcbYXmHICfiob4gZA1yaj4hpfM+Nl5WIJ1EAZsSGHdqmGEF28GuCjyQ8ZeKiJAsPt/vXuLBbjxkHqZyQ==}
dev: true dev: true
/@cspell/dict-html/3.0.4: /@cspell/dict-html/3.1.0:
resolution: {integrity: sha512-DV1lAATRel7vuJZYpnR92pIr9ZeSE+uuQDnkuzJaCP9os+Y6zkkUfvNLbNsqe7wD5IzkSA2CtxOR44MMf2YfvQ==} resolution: {integrity: sha512-HD33wqDxaBBDuBRMlXT1sS8v1Oqw3ZjJocEK8a/JQ8s75sSq4zl6iZIcbkzTHFeDfKPmObCES4z5GbgHKNaQtw==}
dev: true dev: true
/@cspell/dict-java/3.0.7: /@cspell/dict-java/3.0.7:
@ -943,8 +940,8 @@ packages:
resolution: {integrity: sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==} resolution: {integrity: sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==}
dev: true dev: true
/@cspell/dict-software-terms/2.2.2: /@cspell/dict-software-terms/2.2.3:
resolution: {integrity: sha512-s6l3lzKhxXWfu8QsSt1qoUK2l6iGbFKJd0T8XRYfsKnX6fVCUmHNueGWQ6TFCRXDRvHiwGB+UpPicyHPtSJJ5A==} resolution: {integrity: sha512-hpiYrjnGcrSw2q/CiT2bzsB5/OVaK/aOgQvvI6MVnvOk3XzfpAeOr24frrnXTURbuD8pktiRPvAmrTlHrAGCXQ==}
dev: true dev: true
/@cspell/dict-sql/1.0.4: /@cspell/dict-sql/1.0.4:
@ -1024,7 +1021,7 @@ packages:
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies: dependencies:
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
chalk: 4.1.2 chalk: 4.1.2
jest-message-util: 28.1.3 jest-message-util: 28.1.3
jest-util: 28.1.3 jest-util: 28.1.3
@ -1045,14 +1042,14 @@ packages:
'@jest/test-result': 28.1.3 '@jest/test-result': 28.1.3
'@jest/transform': 28.1.3 '@jest/transform': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
ansi-escapes: 4.3.2 ansi-escapes: 4.3.2
chalk: 4.1.2 chalk: 4.1.2
ci-info: 3.3.2 ci-info: 3.3.2
exit: 0.1.2 exit: 0.1.2
graceful-fs: 4.2.10 graceful-fs: 4.2.10
jest-changed-files: 28.1.3 jest-changed-files: 28.1.3
jest-config: 28.1.3_@types+node@18.7.6 jest-config: 28.1.3_@types+node@18.7.9
jest-haste-map: 28.1.3 jest-haste-map: 28.1.3
jest-message-util: 28.1.3 jest-message-util: 28.1.3
jest-regex-util: 28.0.2 jest-regex-util: 28.0.2
@ -1080,7 +1077,7 @@ packages:
dependencies: dependencies:
'@jest/fake-timers': 28.1.3 '@jest/fake-timers': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
jest-mock: 28.1.3 jest-mock: 28.1.3
dev: true dev: true
@ -1107,7 +1104,7 @@ packages:
dependencies: dependencies:
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@sinonjs/fake-timers': 9.1.2 '@sinonjs/fake-timers': 9.1.2
'@types/node': 18.7.6 '@types/node': 18.7.9
jest-message-util: 28.1.3 jest-message-util: 28.1.3
jest-mock: 28.1.3 jest-mock: 28.1.3
jest-util: 28.1.3 jest-util: 28.1.3
@ -1139,7 +1136,7 @@ packages:
'@jest/transform': 28.1.3 '@jest/transform': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@jridgewell/trace-mapping': 0.3.15 '@jridgewell/trace-mapping': 0.3.15
'@types/node': 18.7.6 '@types/node': 18.7.9
chalk: 4.1.2 chalk: 4.1.2
collect-v8-coverage: 1.0.1 collect-v8-coverage: 1.0.1
exit: 0.1.2 exit: 0.1.2
@ -1228,7 +1225,7 @@ packages:
'@jest/schemas': 28.1.3 '@jest/schemas': 28.1.3
'@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-lib-coverage': 2.0.4
'@types/istanbul-reports': 3.0.1 '@types/istanbul-reports': 3.0.1
'@types/node': 18.7.6 '@types/node': 18.7.9
'@types/yargs': 17.0.11 '@types/yargs': 17.0.11
chalk: 4.1.2 chalk: 4.1.2
dev: true dev: true
@ -1605,8 +1602,8 @@ packages:
semver: 7.3.7 semver: 7.3.7
dev: true dev: true
/@parcel/css-darwin-arm64/1.12.2: /@parcel/css-darwin-arm64/1.13.0:
resolution: {integrity: sha512-6VvsoYSltBiUh/uyfPzQ+I3DiTFN7tmRv6zm1LH98J7GGCDDhbYEtbQjjCs15ex6fVn1ORZK0JO+mMlsg1JwTA==} resolution: {integrity: sha512-GqyAeNa0Bah6WuIgqeBJCBRRcGEqkRMkK1YxgaFBhJiicrJJJ1/aZetzOhwNy6JGpQ8wnKP+p+t6IX2wrklaWw==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
@ -1614,8 +1611,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css-darwin-x64/1.12.2: /@parcel/css-darwin-x64/1.13.0:
resolution: {integrity: sha512-3J0/LrDvt5vevOisnrE0q5mEcuiAY+K7OZwIv84SAnrbjlL5sshmIaaNzL869kb4thza+RClEj0mS5XTm1IUEw==} resolution: {integrity: sha512-k7/YBwZ5nDXmyDLCo8Pf7ATqQPo34emv9Tpz2LbYUU3NCO2uhsGzjjsQiYXsAp5QeupPHgDmQeEX6WSvXxo0fQ==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
@ -1623,8 +1620,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css-linux-arm-gnueabihf/1.12.2: /@parcel/css-linux-arm-gnueabihf/1.13.0:
resolution: {integrity: sha512-OsX7I3dhBvnxEbAH++08RFe7yhjRp33ulzrCvJTMOP9YkxEEJ8qId3sNzJBHIVQzHyTlPTnBRHbSDhU3TFe/eQ==} resolution: {integrity: sha512-mBtDUkF/Gje3a7KMt2edEc9rUdKupTy49bvgGFE9dc+k9ZBQg1L8JK35mUo0Y3Y0jJmRDURY2+LRnxvOWJm3TA==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
@ -1632,8 +1629,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css-linux-arm64-gnu/1.12.2: /@parcel/css-linux-arm64-gnu/1.13.0:
resolution: {integrity: sha512-R1Kqw+1Rsru9Q4+qvUEC6B8P21bpqhuF9rv8GmBmmnF1i2hMZ1JiY+uh/ej8IaRV0O3fAHeQGIyGBWx6qWDpcw==} resolution: {integrity: sha512-h90mKM4SpLLHc1vd06O5SkOae9aR36CfX+NWzgwLI4VKiZGcr+D78gsF7+CDkWrf1hqx5UonguMrqlN/MVdJBQ==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
@ -1641,8 +1638,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css-linux-arm64-musl/1.12.2: /@parcel/css-linux-arm64-musl/1.13.0:
resolution: {integrity: sha512-nwixgM4SEgPUQata9aAiJW0A5Q9ms+xim1tXT1i+91kOei4Fu2Wr2OuofMk+mlhbgmGKCTcu4gzMPReGxUhuRA==} resolution: {integrity: sha512-FGg6UyHaPwmZ+IFJmSiUzznNUsGYG1aIvKIWIaw2CgH2cUamqLORSnCIBV4LXrpZJ7I8X2845L76hzMvaetkRg==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
@ -1650,8 +1647,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css-linux-x64-gnu/1.12.2: /@parcel/css-linux-x64-gnu/1.13.0:
resolution: {integrity: sha512-cJYVMHnQSGhDwQByyvjFZppjMBNlgxXl/R4cX5DwrQE0QZmK/42BYnMp92rvoprEG6LRyRoiGtCjyfYTPWajog==} resolution: {integrity: sha512-QJyCKM4ms7OaklffoqleouigDAYATZcCcZkp9AUEt7lqg8i2sWFrInEwWM4QhauwML3gxdKaRVugVZCzMSp3Kg==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
@ -1659,8 +1656,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css-linux-x64-musl/1.12.2: /@parcel/css-linux-x64-musl/1.13.0:
resolution: {integrity: sha512-u9zdO/d831/74Tf+TdPUfaIuB9v6FD4Xz8UdWUDOXgQqaOlnJ9fAsAM39EkoWlMxPPljY3f4ay6irSe1a4XgSA==} resolution: {integrity: sha512-V2mA8hzZaYRyMIZjEAMaZqrziYTtkjHP/jdS+qnAnHNdvIav3+3Saca3hbSnD2hQuM9iu2wzD3gHoVexlCjTOg==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
@ -1668,8 +1665,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css-win32-x64-msvc/1.12.2: /@parcel/css-win32-x64-msvc/1.13.0:
resolution: {integrity: sha512-kCAKr3vKqvPUv9oXBG3pGZQz5il3sEk35dpmTXFa/7eDNKR5XyLpiJs8JwWJTFfuUqroymDSXA1bCcjvNEYcAg==} resolution: {integrity: sha512-0WFdh4nS5lkjLnBr0N6O7OatbjUFZdVBSlPDdTdwEYZkl8La+SnmGGMEkrE/jiQ6NjjwgLorN7xainmPWuQdDw==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
@ -1677,20 +1674,20 @@ packages:
dev: true dev: true
optional: true optional: true
/@parcel/css/1.12.2: /@parcel/css/1.13.0:
resolution: {integrity: sha512-Sa0PvZu5u877CupQA8IjEATqjJFynBfA7LxbcyutFe2LDCRSqB5Bm08jKFScyaz56qjZNIxZxXk2SApNkOvoAA==} resolution: {integrity: sha512-S4QD4Jd+j8QzU5ZZpfg+1cdmEXeJ71wabbV6ff3DJB/05gXWj9Qf/ZZUVtwH3V255Oif6/jcEmcWY4AmFXTyLw==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
dependencies: dependencies:
detect-libc: 1.0.3 detect-libc: 1.0.3
optionalDependencies: optionalDependencies:
'@parcel/css-darwin-arm64': 1.12.2 '@parcel/css-darwin-arm64': 1.13.0
'@parcel/css-darwin-x64': 1.12.2 '@parcel/css-darwin-x64': 1.13.0
'@parcel/css-linux-arm-gnueabihf': 1.12.2 '@parcel/css-linux-arm-gnueabihf': 1.13.0
'@parcel/css-linux-arm64-gnu': 1.12.2 '@parcel/css-linux-arm64-gnu': 1.13.0
'@parcel/css-linux-arm64-musl': 1.12.2 '@parcel/css-linux-arm64-musl': 1.13.0
'@parcel/css-linux-x64-gnu': 1.12.2 '@parcel/css-linux-x64-gnu': 1.13.0
'@parcel/css-linux-x64-musl': 1.12.2 '@parcel/css-linux-x64-musl': 1.13.0
'@parcel/css-win32-x64-msvc': 1.12.2 '@parcel/css-win32-x64-msvc': 1.13.0
dev: true dev: true
/@parcel/diagnostic/2.7.0: /@parcel/diagnostic/2.7.0:
@ -1783,7 +1780,7 @@ packages:
resolution: {integrity: sha512-IfnOMACqhcAclKyOW9X9JpsknB6OShk9OVvb8EvbDTKHJhQHNNmzE88OkSI/pS3ZVZP9Zj+nWcVHguV+kvDeiQ==} resolution: {integrity: sha512-IfnOMACqhcAclKyOW9X9JpsknB6OShk9OVvb8EvbDTKHJhQHNNmzE88OkSI/pS3ZVZP9Zj+nWcVHguV+kvDeiQ==}
engines: {node: '>= 12.0.0', parcel: ^2.7.0} engines: {node: '>= 12.0.0', parcel: ^2.7.0}
dependencies: dependencies:
'@parcel/css': 1.12.2 '@parcel/css': 1.13.0
'@parcel/diagnostic': 2.7.0 '@parcel/diagnostic': 2.7.0
'@parcel/plugin': 2.7.0_@parcel+core@2.7.0 '@parcel/plugin': 2.7.0_@parcel+core@2.7.0
'@parcel/source-map': 2.1.0 '@parcel/source-map': 2.1.0
@ -2043,7 +2040,7 @@ packages:
resolution: {integrity: sha512-J4EpWK9spQpXyNCmKK8Xnane0xW/1B/EAmfp7Fiv7g+5yUjY4ODf4KUugvE+Eb2gekPkhOKNHermO2KrX0/PFA==} resolution: {integrity: sha512-J4EpWK9spQpXyNCmKK8Xnane0xW/1B/EAmfp7Fiv7g+5yUjY4ODf4KUugvE+Eb2gekPkhOKNHermO2KrX0/PFA==}
engines: {node: '>= 12.0.0', parcel: ^2.7.0} engines: {node: '>= 12.0.0', parcel: ^2.7.0}
dependencies: dependencies:
'@parcel/css': 1.12.2 '@parcel/css': 1.13.0
'@parcel/diagnostic': 2.7.0 '@parcel/diagnostic': 2.7.0
'@parcel/plugin': 2.7.0_@parcel+core@2.7.0 '@parcel/plugin': 2.7.0_@parcel+core@2.7.0
'@parcel/source-map': 2.1.0 '@parcel/source-map': 2.1.0
@ -2348,7 +2345,7 @@ packages:
dependencies: dependencies:
'@types/http-cache-semantics': 4.0.1 '@types/http-cache-semantics': 4.0.1
'@types/keyv': 3.1.4 '@types/keyv': 3.1.4
'@types/node': 18.7.6 '@types/node': 18.7.9
'@types/responselike': 1.0.0 '@types/responselike': 1.0.0
dev: true dev: true
@ -2363,7 +2360,7 @@ packages:
/@types/cross-spawn/6.0.2: /@types/cross-spawn/6.0.2:
resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==} resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
dependencies: dependencies:
'@types/node': 18.7.6 '@types/node': 18.7.9
dev: true dev: true
/@types/debug/4.1.7: /@types/debug/4.1.7:
@ -2376,13 +2373,13 @@ packages:
resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
dependencies: dependencies:
'@types/minimatch': 3.0.5 '@types/minimatch': 3.0.5
'@types/node': 18.7.6 '@types/node': 18.7.9
dev: true dev: true
/@types/graceful-fs/4.1.5: /@types/graceful-fs/4.1.5:
resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
dependencies: dependencies:
'@types/node': 18.7.6 '@types/node': 18.7.9
dev: true dev: true
/@types/http-cache-semantics/4.0.1: /@types/http-cache-semantics/4.0.1:
@ -2427,7 +2424,7 @@ packages:
/@types/keyv/3.1.4: /@types/keyv/3.1.4:
resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
dependencies: dependencies:
'@types/node': 18.7.6 '@types/node': 18.7.9
dev: true dev: true
/@types/mdast/3.0.10: /@types/mdast/3.0.10:
@ -2455,11 +2452,11 @@ packages:
/@types/node-fetch/2.6.2: /@types/node-fetch/2.6.2:
resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==} resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
dependencies: dependencies:
'@types/node': 18.7.6 '@types/node': 18.7.9
form-data: 3.0.1 form-data: 3.0.1
/@types/node/18.7.6: /@types/node/18.7.9:
resolution: {integrity: sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==} resolution: {integrity: sha512-0N5Y1XAdcl865nDdjbO0m3T6FdmQ4ijE89/urOHLREyTXbpMWbSafx9y7XIsgWGtwUP2iYTinLyyW3FatAxBLQ==}
/@types/normalize-package-data/2.4.1: /@types/normalize-package-data/2.4.1:
resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
@ -2473,10 +2470,16 @@ packages:
resolution: {integrity: sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==} resolution: {integrity: sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==}
dev: true dev: true
/@types/replace-ext/2.0.0:
resolution: {integrity: sha512-9aGCj2qmL1YHLXfqfzwP1h7fDfeB4l0gSXRndq+20lJ+kljS3/ngOpcn1RJGhZCe5C2JzWu07nElCKcJ6iAJbg==}
requiresBuild: true
dev: false
optional: true
/@types/responselike/1.0.0: /@types/responselike/1.0.0:
resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
dependencies: dependencies:
'@types/node': 18.7.6 '@types/node': 18.7.9
dev: true dev: true
/@types/semver/7.3.12: /@types/semver/7.3.12:
@ -2490,7 +2493,7 @@ packages:
/@types/tunnel/0.0.3: /@types/tunnel/0.0.3:
resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==} resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
dependencies: dependencies:
'@types/node': 18.7.6 '@types/node': 18.7.9
dev: false dev: false
/@types/unist/2.0.6: /@types/unist/2.0.6:
@ -3038,7 +3041,7 @@ packages:
chalk: 5.0.1 chalk: 5.0.1
cli-boxes: 3.0.0 cli-boxes: 3.0.0
string-width: 5.1.2 string-width: 5.1.2
type-fest: 2.18.0 type-fest: 2.18.1
widest-line: 4.0.1 widest-line: 4.0.1
wrap-ansi: 8.0.1 wrap-ansi: 8.0.1
dev: true dev: true
@ -3067,8 +3070,8 @@ packages:
engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
hasBin: true hasBin: true
dependencies: dependencies:
caniuse-lite: 1.0.30001378 caniuse-lite: 1.0.30001380
electron-to-chromium: 1.4.224 electron-to-chromium: 1.4.225
node-releases: 2.0.6 node-releases: 2.0.6
update-browserslist-db: 1.0.5_browserslist@4.21.3 update-browserslist-db: 1.0.5_browserslist@4.21.3
dev: true dev: true
@ -3158,7 +3161,7 @@ packages:
clone-response: 1.0.3 clone-response: 1.0.3
get-stream: 5.2.0 get-stream: 5.2.0
http-cache-semantics: 4.1.0 http-cache-semantics: 4.1.0
keyv: 4.3.3 keyv: 4.4.1
lowercase-keys: 2.0.0 lowercase-keys: 2.0.0
normalize-url: 6.1.0 normalize-url: 6.1.0
responselike: 2.0.1 responselike: 2.0.1
@ -3200,8 +3203,8 @@ packages:
engines: {node: '>=14.16'} engines: {node: '>=14.16'}
dev: true dev: true
/caniuse-lite/1.0.30001378: /caniuse-lite/1.0.30001380:
resolution: {integrity: sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==} resolution: {integrity: sha512-OO+pPubxx16lkI7TVrbFpde8XHz66SMwstl1YWpg6uMGw56XnhYVwtPIjvX4kYpzwMwQKr4DDce394E03dQPGg==}
dev: true dev: true
/capture-stack-trace/1.0.1: /capture-stack-trace/1.0.1:
@ -3646,57 +3649,57 @@ packages:
type-fest: 1.4.0 type-fest: 1.4.0
dev: true dev: true
/cspell-gitignore/6.7.0: /cspell-gitignore/6.8.0:
resolution: {integrity: sha512-AaJduSX0tU/onb+CnZkP/vhMmWnaZencVcnmCSDU1aEpxyBZOcC7CrB+JTFRq7Wcy4+UiLkXQwO3u+OZlfNOTg==} resolution: {integrity: sha512-TR1tPWkl7XnowqK4YftTpYWKyzMJQ8veAQaOTC50cgoUCL23FvoUH65yB4rqOuVKNNaIu5CzgzGSEknSC+EyCA==}
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
dependencies: dependencies:
cspell-glob: 6.7.0 cspell-glob: 6.8.0
find-up: 5.0.0 find-up: 5.0.0
dev: true dev: true
/cspell-glob/6.7.0: /cspell-glob/6.8.0:
resolution: {integrity: sha512-6vmZurV4nejOk10KMDJ27s/7WjM7LM7SvTdJOVbJUC50OTXGKva/dv7MqOTpnlAheV45t5R495KBwkUM/Sgsgg==} resolution: {integrity: sha512-pSVkC+TqfmHYCnBw7gvBctyZtgvugOyvCfYWC+BR37VKcmaI91ZhW7n7SxHlkaKwfLCGi/yMEYBffiJ6FNbeUQ==}
engines: {node: '>=14'} engines: {node: '>=14'}
dependencies: dependencies:
micromatch: 4.0.5 micromatch: 4.0.5
dev: true dev: true
/cspell-grammar/6.7.0: /cspell-grammar/6.8.0:
resolution: {integrity: sha512-R+ilsGw/H9qA7cTTs17K45P7U1c3kSZfLWEAyJtCwYw4hB+1qPwEZDbOBy4HMywznZ5wp/u9nLQpCEcKFEmqBQ==} resolution: {integrity: sha512-FR3zDCtsNASKsVP/bJoQViwf4WiWudXUOHfWJeS1KXAMHY0lp98psWzFzuclXUIU04lh6xkP5zdkEn+BfqtZUA==}
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
dependencies: dependencies:
'@cspell/cspell-pipe': 6.7.0 '@cspell/cspell-pipe': 6.8.0
'@cspell/cspell-types': 6.7.0 '@cspell/cspell-types': 6.8.0
dev: true dev: true
/cspell-io/6.7.0: /cspell-io/6.8.0:
resolution: {integrity: sha512-kJXBk/0PpCYtpY5Q4TjwaUXmGARcqSZrWyW8HnNVNWqnpsTzMr58A7Z0Tm+6/bKKNaTWIc5TzA4QDOel1kjpHQ==} resolution: {integrity: sha512-Jx3Zb1EXtO1AMb011hHyk1AW4Oz/BuOv9xQbH3XH1kTxWzJ21MZzIO1UHDWUhZn7aJI0ybMAZL5+CI4udnd3qg==}
engines: {node: '>=14'} engines: {node: '>=14'}
dependencies: dependencies:
'@cspell/cspell-service-bus': 6.7.0 '@cspell/cspell-service-bus': 6.8.0
'@types/node-fetch': 2.6.2 '@types/node-fetch': 2.6.2
node-fetch: 2.6.7 node-fetch: 2.6.7
transitivePeerDependencies: transitivePeerDependencies:
- encoding - encoding
dev: true dev: true
/cspell-lib/6.7.0: /cspell-lib/6.8.0:
resolution: {integrity: sha512-Q4AQsBjF7K36xbJjRkFZHR/mljaVMvjupHNPxtJUH6WxvxHwaqIZFKC7D8wZlkLfRNoTvvd6ruU+Ljeo5M4VfQ==} resolution: {integrity: sha512-BVJUSUvqC9uyQ11f4M5sqGKx307L8sSb+NQtydxWTMqcbn9+NzOTgor3VRcKuzJBH0Q1kN3sccbpzZ225mHP2g==}
engines: {node: '>=14'} engines: {node: '>=14'}
dependencies: dependencies:
'@cspell/cspell-bundled-dicts': 6.7.0 '@cspell/cspell-bundled-dicts': 6.8.0
'@cspell/cspell-pipe': 6.7.0 '@cspell/cspell-pipe': 6.8.0
'@cspell/cspell-types': 6.7.0 '@cspell/cspell-types': 6.8.0
clear-module: 4.1.2 clear-module: 4.1.2
comment-json: 4.2.3 comment-json: 4.2.3
configstore: 5.0.1 configstore: 5.0.1
cosmiconfig: 7.0.1 cosmiconfig: 7.0.1
cspell-glob: 6.7.0 cspell-glob: 6.8.0
cspell-grammar: 6.7.0 cspell-grammar: 6.8.0
cspell-io: 6.7.0 cspell-io: 6.8.0
cspell-trie-lib: 6.7.0 cspell-trie-lib: 6.8.0
fast-equals: 4.0.1 fast-equals: 4.0.1
find-up: 5.0.0 find-up: 5.0.0
fs-extra: 10.1.0 fs-extra: 10.1.0
@ -3710,27 +3713,27 @@ packages:
- encoding - encoding
dev: true dev: true
/cspell-trie-lib/6.7.0: /cspell-trie-lib/6.8.0:
resolution: {integrity: sha512-RZ5tgK0XBQnR3HQFomHQ31M3JKNHPGazEuCKbiAS6jEYosynErFnW6u1pyx8MjXDlf2Zo8vTRtrz50CAESKZ8g==} resolution: {integrity: sha512-+FKfkXnneuU7n/OrafUQLwOM9TWMFKmtvMZgoJZLX/xOkSHzAlkKqVos8OhK4w2nRns1wy+Nz+iNyEmYaCMnZw==}
engines: {node: '>=14'} engines: {node: '>=14'}
dependencies: dependencies:
'@cspell/cspell-pipe': 6.7.0 '@cspell/cspell-pipe': 6.8.0
'@cspell/cspell-types': 6.7.0 '@cspell/cspell-types': 6.8.0
fs-extra: 10.1.0 fs-extra: 10.1.0
gensequence: 3.1.1 gensequence: 3.1.1
dev: true dev: true
/cspell/6.7.0: /cspell/6.8.0:
resolution: {integrity: sha512-/Ymb8dfwxD+/WnLb1HQ6xlONC8oT1PexdjuE1l4SsHdS0xVMOqvGfVrLUwgvm0pwagpqsGuADTsAdGuYkLS8yA==} resolution: {integrity: sha512-mef1ECEw5bRdxdUvxuf4q7pkUDp9PRaPaLjjcW+v88wp0cyXWhCK/y/MTTa5o+xUkSvHqPXWF1E83NmGey3ZTQ==}
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
dependencies: dependencies:
'@cspell/cspell-pipe': 6.7.0 '@cspell/cspell-pipe': 6.8.0
chalk: 4.1.2 chalk: 4.1.2
commander: 9.4.0 commander: 9.4.0
cspell-gitignore: 6.7.0 cspell-gitignore: 6.8.0
cspell-glob: 6.7.0 cspell-glob: 6.8.0
cspell-lib: 6.7.0 cspell-lib: 6.8.0
fast-json-stable-stringify: 2.1.0 fast-json-stable-stringify: 2.1.0
file-entry-cache: 6.0.1 file-entry-cache: 6.0.1
fs-extra: 10.1.0 fs-extra: 10.1.0
@ -4056,8 +4059,8 @@ packages:
jake: 10.8.5 jake: 10.8.5
dev: true dev: true
/electron-to-chromium/1.4.224: /electron-to-chromium/1.4.225:
resolution: {integrity: sha512-dOujC5Yzj0nOVE23iD5HKqrRSDj2SD7RazpZS/b/WX85MtO6/LzKDF4TlYZTBteB+7fvSg5JpWh0sN7fImNF8w==} resolution: {integrity: sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw==}
dev: true dev: true
/emittery/0.10.2: /emittery/0.10.2:
@ -4189,6 +4192,11 @@ packages:
engines: {node: '>=10'} engines: {node: '>=10'}
dev: true dev: true
/escape-string-regexp/5.0.0:
resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
engines: {node: '>=12'}
dev: false
/eslint-config-airbnb-base/14.2.1_2iahngt3u2tkbdlu6s4gkur3pu: /eslint-config-airbnb-base/14.2.1_2iahngt3u2tkbdlu6s4gkur3pu:
resolution: {integrity: sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==} resolution: {integrity: sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==}
engines: {node: '>= 6'} engines: {node: '>= 6'}
@ -4838,16 +4846,16 @@ packages:
resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==} resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
engines: {node: ^10.12.0 || >=12.0.0} engines: {node: ^10.12.0 || >=12.0.0}
dependencies: dependencies:
flatted: 3.2.6 flatted: 3.2.7
rimraf: 3.0.2 rimraf: 3.0.2
dev: true dev: true
/flatted/3.2.6: /flatted/3.2.7:
resolution: {integrity: sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==} resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
dev: true dev: true
/form-data-encoder/2.0.1: /form-data-encoder/2.1.0:
resolution: {integrity: sha512-Oy+P9w5mnO4TWXVgUiQvggNKPI9/ummcSt5usuIV6HkaLKigwzPpoenhEqmGmx3zHqm6ZLJ+CR/99N8JLinaEw==} resolution: {integrity: sha512-njK60LnfhfDWy+AEUIf9ZQNRAcmXCdDfiNOm2emuPtzwh7U9k/mo9F3S54aPiaZ3vhqUjikVLfcPg2KuBddskQ==}
engines: {node: '>= 14.17'} engines: {node: '>= 14.17'}
dev: true dev: true
@ -5175,7 +5183,7 @@ packages:
cacheable-lookup: 6.1.0 cacheable-lookup: 6.1.0
cacheable-request: 7.0.2 cacheable-request: 7.0.2
decompress-response: 6.0.0 decompress-response: 6.0.0
form-data-encoder: 2.0.1 form-data-encoder: 2.1.0
get-stream: 6.0.1 get-stream: 6.0.1
http2-wrapper: 2.1.11 http2-wrapper: 2.1.11
lowercase-keys: 3.0.0 lowercase-keys: 3.0.0
@ -5871,7 +5879,7 @@ packages:
'@jest/expect': 28.1.3 '@jest/expect': 28.1.3
'@jest/test-result': 28.1.3 '@jest/test-result': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
chalk: 4.1.2 chalk: 4.1.2
co: 4.6.0 co: 4.6.0
dedent: 0.7.0 dedent: 0.7.0
@ -5890,7 +5898,7 @@ packages:
- supports-color - supports-color
dev: true dev: true
/jest-cli/28.1.3_@types+node@18.7.6: /jest-cli/28.1.3_@types+node@18.7.9:
resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
hasBin: true hasBin: true
@ -5907,7 +5915,7 @@ packages:
exit: 0.1.2 exit: 0.1.2
graceful-fs: 4.2.10 graceful-fs: 4.2.10
import-local: 3.1.0 import-local: 3.1.0
jest-config: 28.1.3_@types+node@18.7.6 jest-config: 28.1.3_@types+node@18.7.9
jest-util: 28.1.3 jest-util: 28.1.3
jest-validate: 28.1.3 jest-validate: 28.1.3
prompts: 2.4.2 prompts: 2.4.2
@ -5918,7 +5926,7 @@ packages:
- ts-node - ts-node
dev: true dev: true
/jest-config/28.1.3_@types+node@18.7.6: /jest-config/28.1.3_@types+node@18.7.9:
resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
peerDependencies: peerDependencies:
@ -5933,7 +5941,7 @@ packages:
'@babel/core': 7.18.10 '@babel/core': 7.18.10
'@jest/test-sequencer': 28.1.3 '@jest/test-sequencer': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
babel-jest: 28.1.3_@babel+core@7.18.10 babel-jest: 28.1.3_@babel+core@7.18.10
chalk: 4.1.2 chalk: 4.1.2
ci-info: 3.3.2 ci-info: 3.3.2
@ -5992,7 +6000,7 @@ packages:
'@jest/environment': 28.1.3 '@jest/environment': 28.1.3
'@jest/fake-timers': 28.1.3 '@jest/fake-timers': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
jest-mock: 28.1.3 jest-mock: 28.1.3
jest-util: 28.1.3 jest-util: 28.1.3
dev: true dev: true
@ -6008,7 +6016,7 @@ packages:
dependencies: dependencies:
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/graceful-fs': 4.1.5 '@types/graceful-fs': 4.1.5
'@types/node': 18.7.6 '@types/node': 18.7.9
anymatch: 3.1.2 anymatch: 3.1.2
fb-watchman: 2.0.1 fb-watchman: 2.0.1
graceful-fs: 4.2.10 graceful-fs: 4.2.10
@ -6059,7 +6067,7 @@ packages:
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies: dependencies:
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
dev: true dev: true
/jest-pnp-resolver/1.2.2_jest-resolve@28.1.3: /jest-pnp-resolver/1.2.2_jest-resolve@28.1.3:
@ -6113,7 +6121,7 @@ packages:
'@jest/test-result': 28.1.3 '@jest/test-result': 28.1.3
'@jest/transform': 28.1.3 '@jest/transform': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
chalk: 4.1.2 chalk: 4.1.2
emittery: 0.10.2 emittery: 0.10.2
graceful-fs: 4.2.10 graceful-fs: 4.2.10
@ -6199,7 +6207,7 @@ packages:
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies: dependencies:
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
chalk: 4.1.2 chalk: 4.1.2
ci-info: 3.3.2 ci-info: 3.3.2
graceful-fs: 4.2.10 graceful-fs: 4.2.10
@ -6224,7 +6232,7 @@ packages:
dependencies: dependencies:
'@jest/test-result': 28.1.3 '@jest/test-result': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
'@types/node': 18.7.6 '@types/node': 18.7.9
ansi-escapes: 4.3.2 ansi-escapes: 4.3.2
chalk: 4.1.2 chalk: 4.1.2
emittery: 0.10.2 emittery: 0.10.2
@ -6236,12 +6244,12 @@ packages:
resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies: dependencies:
'@types/node': 18.7.6 '@types/node': 18.7.9
merge-stream: 2.0.0 merge-stream: 2.0.0
supports-color: 8.1.1 supports-color: 8.1.1
dev: true dev: true
/jest/28.1.3_@types+node@18.7.6: /jest/28.1.3_@types+node@18.7.9:
resolution: {integrity: sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==} resolution: {integrity: sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
hasBin: true hasBin: true
@ -6254,7 +6262,7 @@ packages:
'@jest/core': 28.1.3 '@jest/core': 28.1.3
'@jest/types': 28.1.3 '@jest/types': 28.1.3
import-local: 3.1.0 import-local: 3.1.0
jest-cli: 28.1.3_@types+node@18.7.6 jest-cli: 28.1.3_@types+node@18.7.9
transitivePeerDependencies: transitivePeerDependencies:
- '@types/node' - '@types/node'
- supports-color - supports-color
@ -6386,8 +6394,8 @@ packages:
json-buffer: 3.0.0 json-buffer: 3.0.0
dev: true dev: true
/keyv/4.3.3: /keyv/4.4.1:
resolution: {integrity: sha512-AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ==} resolution: {integrity: sha512-PzByhNxfBLnSBW2MZi1DF+W5+qB/7BMpOokewqIvqS8GFtP7xHm2oeGU72Y1fhtfOv/FiEnI4+nyViYDmUChnw==}
dependencies: dependencies:
compress-brotli: 1.3.8 compress-brotli: 1.3.8
json-buffer: 3.0.1 json-buffer: 3.0.1
@ -7594,6 +7602,12 @@ packages:
lines-and-columns: 1.2.4 lines-and-columns: 1.2.4
dev: true dev: true
/path-browserify/1.0.1:
resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
requiresBuild: true
dev: false
optional: true
/path-exists/4.0.0: /path-exists/4.0.0:
resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
engines: {node: '>=8'} engines: {node: '>=8'}
@ -7617,6 +7631,18 @@ packages:
engines: {node: '>=8'} engines: {node: '>=8'}
dev: true dev: true
/patha/0.4.0:
resolution: {integrity: sha512-kLf02g+VPD1JhPwtDBszzcpIRlEcSteBfrHbEWyH9jG81Afv5f3zITDQ6NZys9DtPdd4AFXqZG1IirNQISXklw==}
dependencies:
escape-string-regexp: 5.0.0
replace-ext: 2.0.0
optionalDependencies:
'@types/node': 18.7.9
'@types/replace-ext': 2.0.0
path-browserify: 1.0.1
process: 0.11.10
dev: false
/picocolors/1.0.0: /picocolors/1.0.0:
resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
dev: true dev: true
@ -8101,6 +8127,11 @@ packages:
engines: {node: '>=0.10'} engines: {node: '>=0.10'}
dev: true dev: true
/replace-ext/2.0.0:
resolution: {integrity: sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==}
engines: {node: '>= 10'}
dev: false
/require-directory/2.1.1: /require-directory/2.1.1:
resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
@ -8775,7 +8806,7 @@ packages:
dependencies: dependencies:
bs-logger: 0.2.6 bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0 fast-json-stable-stringify: 2.1.0
jest: 28.1.3_@types+node@18.7.6 jest: 28.1.3_@types+node@18.7.9
jest-util: 28.1.3 jest-util: 28.1.3
json5: 2.2.1 json5: 2.2.1
lodash.memoize: 4.1.2 lodash.memoize: 4.1.2
@ -8873,8 +8904,8 @@ packages:
engines: {node: '>=10'} engines: {node: '>=10'}
dev: true dev: true
/type-fest/2.18.0: /type-fest/2.18.1:
resolution: {integrity: sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw==} resolution: {integrity: sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==}
engines: {node: '>=12.20'} engines: {node: '>=12.20'}
dev: true dev: true

2
src/brew/brew.ts
View File

@ -1,5 +1,5 @@
import { execFileSync } from "child_process" import { execFileSync } from "child_process"
import { dirname } from "path" import { dirname } from "patha"
import which from "which" import which from "which"
let binDir: string | undefined let binDir: string | undefined

2
src/chocolatey/chocolatey.ts
View File

@ -1,7 +1,7 @@
/* eslint-disable require-atomic-updates */ /* eslint-disable require-atomic-updates */
import execa from "execa" import execa from "execa"
import { existsSync } from "fs" import { existsSync } from "fs"
import { dirname } from "path" import { dirname } from "patha"
import which from "which" import which from "which"
import { addPath } from "../utils/env/addEnv" import { addPath } from "../utils/env/addEnv"
import { InstallationInfo } from "../utils/setup/setupBin" import { InstallationInfo } from "../utils/setup/setupBin"

8
src/cmake/cmake.ts
View File

@ -2,7 +2,7 @@ import { extractTar } from "@actions/tool-cache"
import semverLte from "semver/functions/lte" import semverLte from "semver/functions/lte"
import semverCoerce from "semver/functions/coerce" import semverCoerce from "semver/functions/coerce"
import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin" import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin"
import { addBinExtension } from "extension-tools" import { addExeExt } from "patha"
import { extractZip } from "../utils/setup/extract" import { extractZip } from "../utils/setup/extract"
/** Get the platform data for cmake */ /** Get the platform data for cmake */
@ -20,7 +20,7 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
const folderName = `cmake-${version}-${osArchStr}` const folderName = `cmake-${version}-${osArchStr}`
return { return {
binRelativeDir: "bin/", binRelativeDir: "bin/",
binFileName: addBinExtension("cmake"), binFileName: addExeExt("cmake"),
extractedFolderName: folderName, extractedFolderName: folderName,
extractFunction: extractZip, extractFunction: extractZip,
url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.zip`, url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.zip`,
@ -32,7 +32,7 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
const folderName = `cmake-${version}-${osArchStr}` const folderName = `cmake-${version}-${osArchStr}`
return { return {
binRelativeDir: "CMake.app/Contents/bin/", binRelativeDir: "CMake.app/Contents/bin/",
binFileName: addBinExtension("cmake"), binFileName: addExeExt("cmake"),
extractedFolderName: folderName, extractedFolderName: folderName,
extractFunction: extractTar, extractFunction: extractTar,
url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.tar.gz`, url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.tar.gz`,
@ -49,7 +49,7 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
const folderName = `cmake-${version}-${osArchStr}` const folderName = `cmake-${version}-${osArchStr}`
return { return {
binRelativeDir: "bin/", binRelativeDir: "bin/",
binFileName: addBinExtension("cmake"), binFileName: addExeExt("cmake"),
extractedFolderName: folderName, extractedFolderName: folderName,
extractFunction: extractTar, extractFunction: extractTar,
url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.tar.gz`, url: `https://github.com/Kitware/CMake/releases/download/v${version}/${folderName}.tar.gz`,

7
src/doxygen/doxygen.ts
View File

@ -4,13 +4,12 @@ import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin" import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin"
import { setupBrewPack } from "../utils/setup/setupBrewPack" import { setupBrewPack } from "../utils/setup/setupBrewPack"
import { setupChocoPack } from "../utils/setup/setupChocoPack" import { setupChocoPack } from "../utils/setup/setupChocoPack"
import { addBinExtension } from "extension-tools" import { addExeExt, join } from "patha"
import { extractTar, extractZip } from "../utils/setup/extract" import { extractTar, extractZip } from "../utils/setup/extract"
import { notice } from "ci-log" import { notice } from "ci-log"
import { setupGraphviz } from "../graphviz/graphviz" import { setupGraphviz } from "../graphviz/graphviz"
import { getVersion } from "../default_versions" import { getVersion } from "../default_versions"
import { existsSync } from "fs" import { existsSync } from "fs"
import { join } from "path"
import { isArch } from "../utils/env/isArch" import { isArch } from "../utils/env/isArch"
import { hasDnf } from "../utils/env/hasDnf" import { hasDnf } from "../utils/env/hasDnf"
import { setupDnfPack } from "../utils/setup/setupDnfPack" import { setupDnfPack } from "../utils/setup/setupDnfPack"
@ -24,7 +23,7 @@ function getDoxygenPackageInfo(version: string, platform: NodeJS.Platform, _arch
const folderName = `doxygen-${version}` const folderName = `doxygen-${version}`
return { return {
binRelativeDir: "bin/", binRelativeDir: "bin/",
binFileName: addBinExtension("doxygen"), binFileName: addExeExt("doxygen"),
extractedFolderName: folderName, extractedFolderName: folderName,
extractFunction: extractTar, extractFunction: extractTar,
url: `https://www.doxygen.nl/files/${folderName}.linux.bin.tar.gz`, url: `https://www.doxygen.nl/files/${folderName}.linux.bin.tar.gz`,
@ -34,7 +33,7 @@ function getDoxygenPackageInfo(version: string, platform: NodeJS.Platform, _arch
const folderName = `doxygen-${version}` const folderName = `doxygen-${version}`
return { return {
binRelativeDir: "", binRelativeDir: "",
binFileName: addBinExtension("doxygen"), binFileName: addExeExt("doxygen"),
extractedFolderName: folderName, extractedFolderName: folderName,
extractFunction: extractZip, extractFunction: extractZip,
url: `https://www.doxygen.nl/files/${folderName}.windows.x64.bin.zip`, url: `https://www.doxygen.nl/files/${folderName}.windows.x64.bin.zip`,

7
src/gcc/__tests__/gcc.test.ts
View File

@ -1,9 +1,8 @@
import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers" import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers"
import { setupGcc } from "../gcc" import { setupGcc } from "../gcc"
import { getVersion } from "../../default_versions" import { getVersion } from "../../default_versions"
import path from "path" import { join, addExeExt } from "patha"
import execa from "execa" import execa from "execa"
import { addBinExtension } from "extension-tools"
import { chmodSync } from "fs" import { chmodSync } from "fs"
jest.setTimeout(3000000) jest.setTimeout(3000000)
@ -27,8 +26,8 @@ describe("setup-gcc", () => {
expect(process.env.CXX?.includes("g++")).toBeTruthy() expect(process.env.CXX?.includes("g++")).toBeTruthy()
// test compilation // test compilation
const file = path.join(__dirname, "main.cpp") const file = join(__dirname, "main.cpp")
const main_exe = path.join(__dirname, addBinExtension("main")) const main_exe = join(__dirname, addExeExt("main"))
execa.sync("g++", [file, "-o", main_exe], { cwd: __dirname }) execa.sync("g++", [file, "-o", main_exe], { cwd: __dirname })
if (process.platform !== "win32") { if (process.platform !== "win32") {
chmodSync(main_exe, "755") chmodSync(main_exe, "755")

9
src/gcc/gcc.ts
View File

@ -7,10 +7,9 @@ import { setupChocoPack } from "../utils/setup/setupChocoPack"
import semverMajor from "semver/functions/major" import semverMajor from "semver/functions/major"
import semverCoerce from "semver/functions/coerce" import semverCoerce from "semver/functions/coerce"
import { setupMacOSSDK } from "../macos-sdk/macos-sdk" import { setupMacOSSDK } from "../macos-sdk/macos-sdk"
import path from "path" import { join, addExeExt } from "patha"
import { warning, info } from "ci-log" import { warning, info } from "ci-log"
import ciDetect from "@npmcli/ci-detect" import ciDetect from "@npmcli/ci-detect"
import { addBinExtension } from "extension-tools"
import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin" import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin"
import { extract7Zip } from "../utils/setup/extract" import { extract7Zip } from "../utils/setup/extract"
import { isArch } from "../utils/env/isArch" import { isArch } from "../utils/env/isArch"
@ -54,7 +53,7 @@ function getGccPackageInfo(version: string, platform: NodeJS.Platform, arch: str
const exceptionModel: "seh" | "dwarf" = "seh" // SEH is native windows exception model https://github.com/brechtsanders/winlibs_mingw/issues/4#issuecomment-599296483 const exceptionModel: "seh" | "dwarf" = "seh" // SEH is native windows exception model https://github.com/brechtsanders/winlibs_mingw/issues/4#issuecomment-599296483
return { return {
binRelativeDir: "bin/", binRelativeDir: "bin/",
binFileName: addBinExtension("g++"), binFileName: addExeExt("g++"),
extractedFolderName: "mingw64", extractedFolderName: "mingw64",
extractFunction: extract7Zip, extractFunction: extract7Zip,
url: `https://github.com/brechtsanders/winlibs_mingw/releases/download/${mingwInfo.releaseName}/winlibs-${mingwArch}-posix-${exceptionModel}-gcc-${mingwInfo.fileSuffix}.7z`, url: `https://github.com/brechtsanders/winlibs_mingw/releases/download/${mingwInfo.releaseName}/winlibs-${mingwArch}-posix-${exceptionModel}-gcc-${mingwInfo.fileSuffix}.7z`,
@ -163,7 +162,7 @@ async function activateGcc(version: string, binDir: string) {
// ) // )
if (process.platform === "win32") { if (process.platform === "win32") {
promises.push(addEnv("CC", addBinExtension(`${binDir}/gcc`)), addEnv("CXX", addBinExtension(`${binDir}/g++`))) promises.push(addEnv("CC", addExeExt(`${binDir}/gcc`)), addEnv("CXX", addExeExt(`${binDir}/g++`)))
} else { } else {
const majorVersion = semverMajor(semverCoerce(version) ?? version) const majorVersion = semverMajor(semverCoerce(version) ?? version)
if (majorVersion >= 5) { if (majorVersion >= 5) {
@ -197,7 +196,7 @@ async function activateGcc(version: string, binDir: string) {
} }
function addGccLoggingMatcher() { function addGccLoggingMatcher() {
const matcherPath = path.join(__dirname, "gcc_matcher.json") const matcherPath = join(__dirname, "gcc_matcher.json")
if (!existsSync(matcherPath)) { if (!existsSync(matcherPath)) {
return warning("the gcc_matcher.json file does not exist in the same folder as setup_cpp.js") return warning("the gcc_matcher.json file does not exist in the same folder as setup_cpp.js")
} }

7
src/kcov/kcov.ts
View File

@ -1,9 +1,8 @@
import execa from "execa" import execa from "execa"
import { join } from "path" import { join, addExeExt } from "patha"
import which from "which" import which from "which"
import { setupCmake } from "../cmake/cmake" import { setupCmake } from "../cmake/cmake"
import { getVersion } from "../default_versions" import { getVersion } from "../default_versions"
import { addBinExtension } from "extension-tools"
import { extractTarByExe } from "../utils/setup/extract" import { extractTarByExe } from "../utils/setup/extract"
import { setupAptPack } from "../utils/setup/setupAptPack" import { setupAptPack } from "../utils/setup/setupAptPack"
import { setupPacmanPack } from "../utils/setup/setupPacmanPack" import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
@ -22,7 +21,7 @@ function getDownloadKcovPackageInfo(version: string): PackageInfo {
url: `https://github.com/SimonKagstrom/kcov/releases/download/${version}/kcov-amd64.tar.gz`, url: `https://github.com/SimonKagstrom/kcov/releases/download/${version}/kcov-amd64.tar.gz`,
extractedFolderName: "", extractedFolderName: "",
binRelativeDir: "usr/local/bin", binRelativeDir: "usr/local/bin",
binFileName: addBinExtension("kcov"), binFileName: addExeExt("kcov"),
extractFunction: extractTarByExe, extractFunction: extractTarByExe,
} }
} }
@ -32,7 +31,7 @@ function getBuildKcovPackageInfo(version: string): PackageInfo {
url: `https://github.com/SimonKagstrom/kcov/archive/refs/tags/${version}.tar.gz`, url: `https://github.com/SimonKagstrom/kcov/archive/refs/tags/${version}.tar.gz`,
extractedFolderName: "", extractedFolderName: "",
binRelativeDir: "build/src", binRelativeDir: "build/src",
binFileName: addBinExtension("kcov"), binFileName: addExeExt("kcov"),
extractFunction: buildKcov, extractFunction: buildKcov,
} }
} }

5
src/llvm/__tests__/llvm.test.ts
View File

@ -4,8 +4,7 @@ import { isUrlOnline } from "is-url-online"
import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers" import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
import ciDetect from "@npmcli/ci-detect" import ciDetect from "@npmcli/ci-detect"
import execa from "execa" import execa from "execa"
import path from "path" import path, { addExeExt } from "patha"
import { addBinExtension } from "extension-tools"
import { chmodSync } from "fs" import { chmodSync } from "fs"
import { getVersion } from "../../default_versions" import { getVersion } from "../../default_versions"
import { ubuntuVersion } from "../../utils/env/ubuntu_version" import { ubuntuVersion } from "../../utils/env/ubuntu_version"
@ -88,7 +87,7 @@ describe("setup-llvm", () => {
// test compilation // test compilation
const file = path.join(__dirname, "main.cpp") const file = path.join(__dirname, "main.cpp")
const main_exe = path.join(__dirname, addBinExtension("main")) const main_exe = path.join(__dirname, addExeExt("main"))
execa.sync("clang++", [file, "-o", main_exe], { cwd: __dirname }) execa.sync("clang++", [file, "-o", main_exe], { cwd: __dirname })
if (process.platform !== "win32") { if (process.platform !== "win32") {
chmodSync(main_exe, "755") chmodSync(main_exe, "755")

18
src/llvm/llvm.ts
View File

@ -1,4 +1,5 @@
import * as path from "path" import { join, addExeExt } from "patha"
import { delimiter } from "path"
import semverLte from "semver/functions/lte" import semverLte from "semver/functions/lte"
import semverMajor from "semver/functions/major" import semverMajor from "semver/functions/major"
import { isUrlOnline } from "is-url-online" import { isUrlOnline } from "is-url-online"
@ -11,7 +12,6 @@ import {
semverCoerceIfInvalid, semverCoerceIfInvalid,
} from "../utils/setup/version" } from "../utils/setup/version"
import { setupMacOSSDK } from "../macos-sdk/macos-sdk" import { setupMacOSSDK } from "../macos-sdk/macos-sdk"
import { addBinExtension } from "extension-tools"
import { addEnv } from "../utils/env/addEnv" import { addEnv } from "../utils/env/addEnv"
import { setOutput } from "@actions/core" import { setOutput } from "@actions/core"
import { setupAptPack, updateAptAlternatives } from "../utils/setup/setupAptPack" import { setupAptPack, updateAptAlternatives } from "../utils/setup/setupAptPack"
@ -267,7 +267,7 @@ async function getLLVMPackageInfo(version: string, platform: NodeJS.Platform, _a
url, url,
extractedFolderName: "", extractedFolderName: "",
binRelativeDir: "bin", binRelativeDir: "bin",
binFileName: addBinExtension("clang"), binFileName: addExeExt("clang"),
extractFunction: extractFunction:
platform === "win32" platform === "win32"
? extractExe ? extractExe
@ -306,7 +306,7 @@ async function _setupLLVM(version: string, setupDir: string, arch: string) {
export async function activateLLVM(directory: string, versionGiven: string) { export async function activateLLVM(directory: string, versionGiven: string) {
const version = semverCoerceIfInvalid(versionGiven) const version = semverCoerceIfInvalid(versionGiven)
const lib = path.join(directory, "lib") const lib = join(directory, "lib")
const ld = process.env.LD_LIBRARY_PATH ?? "" const ld = process.env.LD_LIBRARY_PATH ?? ""
const dyld = process.env.DYLD_LIBRARY_PATH ?? "" const dyld = process.env.DYLD_LIBRARY_PATH ?? ""
@ -316,16 +316,16 @@ export async function activateLLVM(directory: string, versionGiven: string) {
addEnv("LLVM_PATH", directory), addEnv("LLVM_PATH", directory),
// Setup LLVM as the compiler // Setup LLVM as the compiler
addEnv("LD_LIBRARY_PATH", `${lib}${path.delimiter}${ld}`), addEnv("LD_LIBRARY_PATH", `${lib}${delimiter}${ld}`),
addEnv("DYLD_LIBRARY_PATH", `${lib}${path.delimiter}${dyld}`), addEnv("DYLD_LIBRARY_PATH", `${lib}${delimiter}${dyld}`),
// compiler flags // compiler flags
addEnv("LDFLAGS", `-L"${directory}/lib"`), addEnv("LDFLAGS", `-L"${directory}/lib"`),
addEnv("CPPFLAGS", `-I"${directory}/include"`), addEnv("CPPFLAGS", `-I"${directory}/include"`),
// compiler paths // compiler paths
addEnv("CC", addBinExtension(`${directory}/bin/clang`)), addEnv("CC", addExeExt(`${directory}/bin/clang`)),
addEnv("CXX", addBinExtension(`${directory}/bin/clang++`)), addEnv("CXX", addExeExt(`${directory}/bin/clang++`)),
addEnv("LIBRARY_PATH", `${directory}/lib`), addEnv("LIBRARY_PATH", `${directory}/lib`),
@ -369,7 +369,7 @@ export function setupClangTools(version: string, setupDir: string, arch: string)
} }
function addLLVMLoggingMatcher() { function addLLVMLoggingMatcher() {
const matcherPath = path.join(__dirname, "llvm_matcher.json") const matcherPath = join(__dirname, "llvm_matcher.json")
if (!existsSync(matcherPath)) { if (!existsSync(matcherPath)) {
return warning("the llvm_matcher.json file does not exist in the same folder as setup_cpp.js") return warning("the llvm_matcher.json file does not exist in the same folder as setup_cpp.js")
} }

2
src/main.ts
View File

@ -36,7 +36,7 @@ import { setupGcc } from "./gcc/gcc"
import { InstallationInfo } from "./utils/setup/setupBin" import { InstallationInfo } from "./utils/setup/setupBin"
import { error, info, success, warning } from "ci-log" import { error, info, success, warning } from "ci-log"
import { setupVcpkg } from "./vcpkg/vcpkg" import { setupVcpkg } from "./vcpkg/vcpkg"
import { join } from "path" import { join } from "patha"
import { setupVCVarsall } from "./vcvarsall/vcvarsall" import { setupVCVarsall } from "./vcvarsall/vcvarsall"
import { setupKcov } from "./kcov/kcov" import { setupKcov } from "./kcov/kcov"
import { addEnv } from "./utils/env/addEnv" import { addEnv } from "./utils/env/addEnv"

4
src/msvc/msvc.ts
View File

@ -4,7 +4,7 @@ import { setupVCVarsall } from "../vcvarsall/vcvarsall"
// @ts-ignore // @ts-ignore
import { vsversion_to_versionnumber, findVcvarsall } from "msvc-dev-cmd/lib.js" import { vsversion_to_versionnumber, findVcvarsall } from "msvc-dev-cmd/lib.js"
import ciDetect from "@npmcli/ci-detect" import ciDetect from "@npmcli/ci-detect"
import path from "path" import { join } from "patha"
import { existsSync } from "fs" import { existsSync } from "fs"
import { error, info, warning } from "ci-log" import { error, info, warning } from "ci-log"
@ -71,7 +71,7 @@ export async function setupMSVC(
} }
function addMSVCLoggingMatcher() { function addMSVCLoggingMatcher() {
const matcherPath = path.join(__dirname, "msvc_matcher.json") const matcherPath = join(__dirname, "msvc_matcher.json")
if (!existsSync(matcherPath)) { if (!existsSync(matcherPath)) {
return warning("the msvc_matcher.json file does not exist in the same folder as setup_cpp.js") return warning("the msvc_matcher.json file does not exist in the same folder as setup_cpp.js")
} }

2
src/nala/nala.ts
View File

@ -1,4 +1,4 @@
import { dirname } from "path" import { dirname } from "patha"
import which from "which" import which from "which"
import { isUbuntu } from "../utils/env/isUbuntu" import { isUbuntu } from "../utils/env/isUbuntu"
import { execRootSync } from "root-tools" import { execRootSync } from "root-tools"

4
src/ninja/ninja.ts
View File

@ -1,4 +1,4 @@
import { addBinExtension } from "extension-tools" import { addExeExt } from "patha"
import { extractZip } from "../utils/setup/extract" import { extractZip } from "../utils/setup/extract"
import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin" import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin"
@ -22,7 +22,7 @@ function getNinjaPackageInfo(version: string, platform: NodeJS.Platform, _arch:
const ninjaPlatform = getNinjaPlatform(platform) const ninjaPlatform = getNinjaPlatform(platform)
return { return {
binRelativeDir: "", binRelativeDir: "",
binFileName: addBinExtension("ninja"), binFileName: addExeExt("ninja"),
extractedFolderName: "", extractedFolderName: "",
extractFunction: extractZip, extractFunction: extractZip,
url: `https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-${ninjaPlatform}.zip`, url: `https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-${ninjaPlatform}.zip`,

4
src/python/actions_python.ts
View File

@ -3,7 +3,7 @@ import { findPyPyVersion } from "setup-python/src/find-pypy"
import { existsSync } from "fs" import { existsSync } from "fs"
import { info, warning } from "ci-log" import { info, warning } from "ci-log"
import { debug } from "@actions/core" import { debug } from "@actions/core"
import path from "path" import { join } from "patha"
import ciDetect from "@npmcli/ci-detect" import ciDetect from "@npmcli/ci-detect"
import { isCacheFeatureAvailable, IS_LINUX, IS_WINDOWS } from "setup-python/src/utils" import { isCacheFeatureAvailable, IS_LINUX, IS_WINDOWS } from "setup-python/src/utils"
import { getCacheDistributor } from "setup-python/src/cache-distributions/cache-factory" import { getCacheDistributor } from "setup-python/src/cache-distributions/cache-factory"
@ -80,7 +80,7 @@ export async function setupActionsPython(version: string, _setupDir: string, arc
} }
function addPythonLoggingMatcher() { function addPythonLoggingMatcher() {
const matcherPath = path.join(__dirname, "python_matcher.json") const matcherPath = join(__dirname, "python_matcher.json")
if (!existsSync(matcherPath)) { if (!existsSync(matcherPath)) {
return warning("the python_matcher.json file does not exist in the same folder as setup_cpp.js") return warning("the python_matcher.json file does not exist in the same folder as setup_cpp.js")
} }

2
src/python/python.ts
View File

@ -8,7 +8,7 @@ import { warning, info } from "ci-log"
import { isArch } from "../utils/env/isArch" import { isArch } from "../utils/env/isArch"
import which from "which" import which from "which"
import { InstallationInfo } from "../utils/setup/setupBin" import { InstallationInfo } from "../utils/setup/setupBin"
import { dirname, join } from "path" import { dirname, join } from "patha"
import { hasDnf } from "../utils/env/hasDnf" import { hasDnf } from "../utils/env/hasDnf"
import { setupDnfPack } from "../utils/setup/setupDnfPack" import { setupDnfPack } from "../utils/setup/setupDnfPack"
import { isUbuntu } from "../utils/env/isUbuntu" import { isUbuntu } from "../utils/env/isUbuntu"

4
src/task/task.ts
View File

@ -1,4 +1,4 @@
import { addBinExtension } from "extension-tools" import { addExeExt } from "patha"
import { extractTarByExe, extractZip } from "../utils/setup/extract" import { extractTarByExe, extractZip } from "../utils/setup/extract"
import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin" import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin"
@ -35,7 +35,7 @@ function getTaskPackageInfo(version: string, platform: NodeJS.Platform, arch: st
const extension = isZip ? "zip" : "tar.gz" const extension = isZip ? "zip" : "tar.gz"
return { return {
binRelativeDir: "", binRelativeDir: "",
binFileName: addBinExtension("task"), binFileName: addExeExt("task"),
extractedFolderName: "", extractedFolderName: "",
extractFunction: isZip ? extractZip : extractTarByExe, extractFunction: isZip ? extractZip : extractTarByExe,
url: `https://github.com/go-task/task/releases/download/v${version}/task_${taskPlatform}_${taskArch}.${extension}`, url: `https://github.com/go-task/task/releases/download/v${version}/task_${taskPlatform}_${taskArch}.${extension}`,

2
src/utils/env/addEnv.ts vendored
View File

@ -85,7 +85,7 @@ async function addPathSystem(path: string) {
case "win32": { case "win32": {
// We do not use `execa.sync(`setx PATH "${path};%PATH%"`)` because of its character limit and also because %PATH% is different for user and system // We do not use `execa.sync(`setx PATH "${path};%PATH%"`)` because of its character limit and also because %PATH% is different for user and system
await execPowershell( await execPowershell(
`$USER_PATH=([Environment]::GetEnvironmentVariable("PATH", "User")); [Environment]::SetEnvironmentVariable("PATH", "${path};$USER_PATH", "User")` `$USER_PATH=([Environment]::GetEnvironmentVariable("patha", "User")); [Environment]::SetEnvironmentVariable("patha", "${path};$USER_PATH", "User")`
) )
info(`"${path}" was added to the PATH.`) info(`"${path}" was added to the PATH.`)
return return

2
src/utils/setup/setupBin.ts
View File

@ -1,7 +1,7 @@
import { find, downloadTool, cacheDir } from "@actions/tool-cache" import { find, downloadTool, cacheDir } from "@actions/tool-cache"
import { info } from "@actions/core" import { info } from "@actions/core"
import { addPath } from "../env/addEnv" import { addPath } from "../env/addEnv"
import { join } from "path" import { join } from "patha"
import { existsSync } from "fs" import { existsSync } from "fs"
import { tmpdir } from "os" import { tmpdir } from "os"
import ciDetect from "@npmcli/ci-detect" import ciDetect from "@npmcli/ci-detect"

2
src/utils/setup/setupPipPack.ts
View File

@ -6,7 +6,7 @@ import { info } from "@actions/core"
import { addPath } from "../env/addEnv" import { addPath } from "../env/addEnv"
import { setupPython } from "../../python/python" import { setupPython } from "../../python/python"
import { isBinUptoDate } from "./version" import { isBinUptoDate } from "./version"
import { join } from "path" import { join } from "patha"
import { getVersion } from "../../default_versions" import { getVersion } from "../../default_versions"
import { InstallationInfo } from "./setupBin" import { InstallationInfo } from "./setupBin"
import { setupAptPack } from "./setupAptPack" import { setupAptPack } from "./setupAptPack"

7
src/utils/tests/test-helpers.ts
View File

@ -1,8 +1,7 @@
import * as io from "@actions/io" import * as io from "@actions/io"
import { tmpdir } from "os" import { tmpdir } from "os"
import * as path from "path" import * as path from "patha"
import { addBinExtension } from "extension-tools" import { addExeExt, join } from "patha"
import { join } from "path"
import spawn from "cross-spawn" import spawn from "cross-spawn"
import { existsSync } from "fs" import { existsSync } from "fs"
@ -41,7 +40,7 @@ export async function testBin(
expect(binDir).toBeDefined() expect(binDir).toBeDefined()
expect(binDir).not.toHaveLength(0) expect(binDir).not.toHaveLength(0)
expect(existsSync(binDir)).toBeTruthy() expect(existsSync(binDir)).toBeTruthy()
bin = join(binDir, addBinExtension(name)) bin = join(binDir, addExeExt(name))
} }
if (args !== null) { if (args !== null) {

11
src/vcpkg/vcpkg.ts
View File

@ -1,9 +1,8 @@
import execa from "execa" import execa from "execa"
import { existsSync } from "fs" import { existsSync } from "fs"
import { dirname, join } from "path" import { dirname, join, addShExt, addShRelativePrefix } from "patha"
import which from "which" import which from "which"
import { addPath } from "../utils/env/addEnv" import { addPath } from "../utils/env/addEnv"
import { addShellExtension, addShellHere } from "extension-tools"
import { notice } from "ci-log" import { notice } from "ci-log"
import { setupAptPack } from "../utils/setup/setupAptPack" import { setupAptPack } from "../utils/setup/setupAptPack"
import { setupPacmanPack } from "../utils/setup/setupPacmanPack" import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
@ -45,13 +44,17 @@ export async function setupVcpkg(_version: string, setupDir: string, _arch: stri
} }
} }
if (!existsSync(join(setupDir, addShellExtension("bootstrap-vcpkg")))) { if (!existsSync(join(setupDir, addShExt("bootstrap-vcpkg", ".bat")))) {
execa.sync("git", ["clone", "https://github.com/microsoft/vcpkg"], { cwd: dirname(setupDir), stdio: "inherit" }) execa.sync("git", ["clone", "https://github.com/microsoft/vcpkg"], { cwd: dirname(setupDir), stdio: "inherit" })
} else { } else {
notice(`Vcpkg folder already exists at ${setupDir}. This might mean that ~/vcpkg is restored from the cache.`) notice(`Vcpkg folder already exists at ${setupDir}. This might mean that ~/vcpkg is restored from the cache.`)
} }
execa.sync(addShellExtension(addShellHere("bootstrap-vcpkg")), { cwd: setupDir, shell: true, stdio: "inherit" }) execa.sync(addShExt(addShRelativePrefix("bootstrap-vcpkg"), ".bat"), {
cwd: setupDir,
shell: true,
stdio: "inherit",
})
giveUserAccess(setupDir) giveUserAccess(setupDir)