diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 6f67c9e0..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "cSpell.words": [ - "buildtools", - "ccache", - "cmake", - "CPATH", - "Cppcheck", - "CPPFLAGS", - "cpprc", - "dyld", - "eabi", - "execa", - "gcovr", - "Graphviz", - "isci", - "LDFLAGS", - "msbuild", - "msvc", - "msys", - "multilib", - "nothrow", - "Opencppcoverage", - "OSSDK", - "setx", - "untildify", - "vcpkg", - "visualc", - "visualcpp" - ] -} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..b427d746 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,11 @@ +# Contributing + +You will need [`pnpm`](https://pnpm.io/installation) to build and test `setup-cpp`: + +```shell +pnpm install +``` + +Before running the tests locally, backup your environment variables because faulty code might corrupt the environment. + + diff --git a/LICENSE.dependencies.txt b/LICENSE.dependencies.txt index 91785eb9..3e19665f 100644 --- a/LICENSE.dependencies.txt +++ b/LICENSE.dependencies.txt @@ -1,13 +1,13 @@ setup-cpp reused some code from the following projects: -- [install-llvm-action](https://github.com/KyleMayes/install-llvm-action/blob/master/LICENSE.txt): Apach-2.0 +- [install-llvm-action](https://github.com/KyleMayes/install-llvm-action/blob/master/LICENSE.txt): Apache-2.0 - [install-cmake](https://github.com/Symbitic/install-cmake/blob/master/LICENSE.md): MIT - [get-cmake](https://github.com/lukka/get-cmake/blob/main/LICENSE.txt): MIT - [gha-setup-ninja](https://github.com/seanmiddleditch/gha-setup-ninja): MIT - [msvc-problem-matcher](https://github.com/ammaraskar/msvc-problem-matcher): Apache-2.0 - [gcc-problem-matcher](https://github.com/ammaraskar/gcc-problem-matcher): Apache-2.0 -This package also uses the depedencies listed in package.json. You can get the list of their licenses using the following command: +This package also uses the dependencies listed in package.json. You can get the list of their licenses using the following command: ``` npm install -g license-checker license-checker --summary --production --excludePackages "setup-python@2.2.2" diff --git a/README.md b/README.md index 878718b1..39dbb44e 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ An example that installs llvm, cmake, ninja, ccache, and vcpkg: curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.10.0/setup_cpp_windows.exe" ./setup_cpp_windows --compiler llvm --cmake true --ninja true --ccache true --vcpkg true -RefreshEnv.cmd # activate cpp enviroment variables +RefreshEnv.cmd # activate cpp environment variables ``` ```ps1 @@ -70,7 +70,7 @@ wget "https://github.com/aminya/setup-cpp/releases/download/v0.10.0/setup_cpp_li chmod +x setup_cpp_linux sudo ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true -source ~/.cpprc # activate cpp enviroment variables +source ~/.cpprc # activate cpp environment variables ``` ```ps1 @@ -79,7 +79,7 @@ wget "https://github.com/aminya/setup-cpp/releases/download/v0.10.0/setup_cpp_ma chmod +x setup_cpp_mac sudo ./setup_cpp_mac --compiler llvm --cmake true --ninja true --ccache true --vcpkg true -source ~/.cpprc # activate cpp enviroment variables +source ~/.cpprc # activate cpp environment variables ``` NOTE: In the `compiler` entry, you can specify the version after `-` like `llvm-11.0.0`. For the tools, you can pass a specific version instead of `true` that chooses the default version @@ -101,7 +101,7 @@ Open the shell as admin, download via `curl`, then install curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.10.0/setup_cpp.js" node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true -RefreshEnv.cmd # activate cpp enviroment variables +RefreshEnv.cmd # activate cpp environment variables ``` On Linux or Mac: @@ -110,7 +110,7 @@ On Linux or Mac: wget "https://github.com/aminya/setup-cpp/releases/download/v0.10.0/setup_cpp.js" sudo node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true -source ~/.cpprc # activate cpp enviroment variables +source ~/.cpprc # activate cpp environment variables ``` ## Inside GitHub Actions @@ -191,7 +191,7 @@ RUN chmod +x ./setup_cpp_linux # install llvm, cmake, ninja, and ccache RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true -# activate cpp enviroment variables +# activate cpp environment variables RUN source ~/.cpprc ENTRYPOINT [ "/bin/sh" ] diff --git a/cspell.config.yaml b/cspell.config.yaml new file mode 100644 index 00000000..497f9a59 --- /dev/null +++ b/cspell.config.yaml @@ -0,0 +1,67 @@ +version: "0.2" +files: + - "**/*" +useGitignore: true +enableGlobDot: true +ignorePaths: + - pnpm-lock.yaml + - .git/ + - dist/ +words: + - "buildtools" + - "ccache" + - "cmake" + - "CPATH" + - "Cppcheck" + - "CPPFLAGS" + - "cpprc" + - "dyld" + - "eabi" + - "execa" + - "gcovr" + - "Graphviz" + - "isci" + - "LDFLAGS" + - "msbuild" + - "msvc" + - "msys" + - "multilib" + - "nothrow" + - "Opencppcoverage" + - "OSSDK" + - "setx" + - "untildify" + - "vcpkg" + - "visualc" + - "visualcpp" + - pnpm + - Yahyaabadi + - vcvarsall + - kcov + - choco + - vsversion + - pwsh + - pypy + - ghes + - applellvm + - xcrun + - libstdc + - libtinfo + - libdw + - npmrc + - setupcpp + - aarch + - devel + - aminya + - caxa + - libbinutils + - tsbuildinfo + - deps + - mxschmitt + - terserrc +ignoreWords: [] +import: [] +dictionaryDefinitions: [] +dictionaries: [] +language: "en, en-GB" +allowCompoundWords: true diff --git a/package.json b/package.json index eba67f5e..78220752 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./building/scripts/pack-exe.js", "prepare": "npm run build", "start.docker": "docker run -t setup_cpp .", - "test": "run-p test.format test.lint test.tsc test.unit", + "test": "run-p test.format test.lint test.cspell test.tsc test.unit", + "test.cspell": "cspell lint --no-progress --show-suggestions", "test.format": "prettier . --check", "test.lint": "eslint .", "test.tsc": "tsc --noEmit", @@ -54,6 +55,7 @@ "caxa": "^2.1.0", "cross-env": "7.0.3", "cross-spawn": "^7.0.3", + "cspell": "^5.18.5", "eslint": "^8.11.0", "eslint-config-atomic": "^1.17.0", "jest": "^27.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3ba90227..69c75930 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,6 +21,7 @@ specifiers: caxa: ^2.1.0 cross-env: 7.0.3 cross-spawn: ^7.0.3 + cspell: ^5.18.5 eslint: ^8.11.0 eslint-config-atomic: ^1.17.0 execa: ^5.1.1 @@ -64,6 +65,7 @@ devDependencies: caxa: 2.1.0 cross-env: 7.0.3 cross-spawn: 7.0.3 + cspell: 5.18.5 eslint: 8.11.0 eslint-config-atomic: 1.17.0 jest: 27.5.1 @@ -636,6 +638,217 @@ packages: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true + /@cspell/cspell-bundled-dicts/5.18.5: + resolution: {integrity: sha512-jFvwF8bb8HUYqMUPQiGZUHAf8zfriZRagzoCW8w4NLLJB1IZNGlQvQCQskQG9cYtOmKAYHCbOwm8SjA9FKwQow==} + engines: {node: '>=12.13.0'} + dependencies: + '@cspell/dict-ada': 2.0.0 + '@cspell/dict-aws': 2.0.0 + '@cspell/dict-bash': 2.0.1 + '@cspell/dict-companies': 2.0.2 + '@cspell/dict-cpp': 2.0.0 + '@cspell/dict-cryptocurrencies': 2.0.0 + '@cspell/dict-csharp': 2.0.1 + '@cspell/dict-css': 2.0.0 + '@cspell/dict-dart': 1.1.0 + '@cspell/dict-django': 2.0.0 + '@cspell/dict-dotnet': 2.0.0 + '@cspell/dict-elixir': 2.0.1 + '@cspell/dict-en_us': 2.1.7 + '@cspell/dict-en-gb': 1.1.33 + '@cspell/dict-filetypes': 2.0.1 + '@cspell/dict-fonts': 2.0.0 + '@cspell/dict-fullstack': 2.0.4 + '@cspell/dict-golang': 2.0.0 + '@cspell/dict-haskell': 2.0.0 + '@cspell/dict-html': 3.0.0 + '@cspell/dict-html-symbol-entities': 2.0.0 + '@cspell/dict-java': 2.0.0 + '@cspell/dict-latex': 2.0.0 + '@cspell/dict-lorem-ipsum': 2.0.0 + '@cspell/dict-lua': 2.0.0 + '@cspell/dict-node': 2.0.0 + '@cspell/dict-npm': 2.0.1 + '@cspell/dict-php': 2.0.0 + '@cspell/dict-powershell': 2.0.0 + '@cspell/dict-public-licenses': 1.0.4 + '@cspell/dict-python': 2.0.6 + '@cspell/dict-r': 1.0.2 + '@cspell/dict-ruby': 2.0.1 + '@cspell/dict-rust': 2.0.0 + '@cspell/dict-scala': 2.0.0 + '@cspell/dict-software-terms': 2.1.3 + '@cspell/dict-swift': 1.0.2 + '@cspell/dict-typescript': 2.0.0 + '@cspell/dict-vue': 2.0.2 + dev: true + + /@cspell/cspell-pipe/5.18.5: + resolution: {integrity: sha512-U/4e4Zm7Mm23SuJu6b49+9Do/2aS+c9sPQa1Z9ZZqHQ4BqswJagk5oZ0V45BjYJ/0acHSRpIxbndpVJ01cjf8A==} + engines: {node: '>=12.13.0'} + dev: true + + /@cspell/cspell-types/5.18.5: + resolution: {integrity: sha512-yvDFCUa1CbjBuMkFCh+yUAAaG6VW5WXoewzLwhMFsMV1GZmkbftOcvZq0YuZviNsjdBViDH0dhKdlzwC953upg==} + engines: {node: '>=12.13.0'} + dev: true + + /@cspell/dict-ada/2.0.0: + resolution: {integrity: sha512-4gfJEYXVwz6IN2LBaT6QoUV4pqaR35i0z0u9O684vLuVczvNJIHa4vNaSEFBr9d6xxncUyqstgP9P73ajJjh9A==} + dev: true + + /@cspell/dict-aws/2.0.0: + resolution: {integrity: sha512-NKz7pDZ7pwj/b33i3f4WLpC1rOOUMmENwYgftxU+giU2YBeKM2wZbMTSEIzsrel56r0UlQYmdIVlP/B4nnVaoQ==} + dev: true + + /@cspell/dict-bash/2.0.1: + resolution: {integrity: sha512-pBx3T/5w7fPF8XD5cx3NwtRFvNpQYmYqzM043NKP2hDmlx4uFwbH599Lvt5mwCMZKfIoRXaNUQvq7se2gstQjw==} + dev: true + + /@cspell/dict-companies/2.0.2: + resolution: {integrity: sha512-LPKwBMAWRz+p1R8q+TV6E1sGOOTvxJOaJeXNN++CZQ7i6JMn5Rf+BSxagwkeK6z3o9vIC5ZE4AcQ5BMkvyjqGw==} + dev: true + + /@cspell/dict-cpp/2.0.0: + resolution: {integrity: sha512-EflHLs2pHEEXZM6jPfTGR/KHZKQtJlvzqgkg1zaA1YKv5HQNw9Wy5KVPGEV2bjPcFsZJO3xXjO1KBZcoOPjPmA==} + dev: true + + /@cspell/dict-cryptocurrencies/2.0.0: + resolution: {integrity: sha512-nREysmmfOp7L2YCRAUufQahwD5/Punzb5AZ6eyg4zUamdRWHgBFphb5/9h2flt1vgdUfhc6hZcML21Ci7iXjaA==} + dev: true + + /@cspell/dict-csharp/2.0.1: + resolution: {integrity: sha512-ZzAr+WRP2FUtXHZtfhe8f3j9vPjH+5i44Hcr5JqbWxmqciGoTbWBPQXwu9y+J4mbdC69HSWRrVGkNJ8rQk8pSw==} + dev: true + + /@cspell/dict-css/2.0.0: + resolution: {integrity: sha512-MrFyswFHnPh4H0u6IlV4eHy+ZCUrrHzeL161LyTOqCvaKpbZavMgNYXzZqTF9xafO0iLgwKrl+Gkclu1KVBg0Q==} + dev: true + + /@cspell/dict-dart/1.1.0: + resolution: {integrity: sha512-bBqZINm+RVjMgUrAhRzv/xx3jc3dkIqO0higPbsK+63IAtMNY3EiQnEO4eapbU+qAhyvICY9hZQZXy5Ux4p+Pw==} + dev: true + + /@cspell/dict-django/2.0.0: + resolution: {integrity: sha512-GkJdJv6cmzrKcmq2/oxTXjKF5uv71r4eTqnFmgPbNBW1t+G4VYpzOf0QrVQrhx2RC4DdW5XfcTf+iS0FxHOTmw==} + dev: true + + /@cspell/dict-dotnet/2.0.0: + resolution: {integrity: sha512-WOHfjwMuLbo76khDsDa1lJvP/dXcwXVwonWwfUFRt82BL/GtyMalh1HEtCWwKDuK/9f8PCEt/EZMkHT3D5ZV3w==} + dev: true + + /@cspell/dict-elixir/2.0.1: + resolution: {integrity: sha512-eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow==} + dev: true + + /@cspell/dict-en-gb/1.1.33: + resolution: {integrity: sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==} + dev: true + + /@cspell/dict-en_us/2.1.7: + resolution: {integrity: sha512-7IeAHZjXiWSIKFx/3CIlY6misvg2KyJ2KO3tSVSKuAlC3UXHGVOcbcY0kQ95IJeKbB6Ot6aW/Aaw73Nzhuurrg==} + dev: true + + /@cspell/dict-filetypes/2.0.1: + resolution: {integrity: sha512-bQ7K3U/3hKO2lpQjObf0veNP/n50qk5CVezSwApMBckf/sAVvDTR1RGAvYdr+vdQnkdQrk6wYmhbshXi0sLDVg==} + dev: true + + /@cspell/dict-fonts/2.0.0: + resolution: {integrity: sha512-AgkTalphfDPtKFPYmEExDcj8rRCh86xlOSXco8tehOEkYVYbksOk9XH0YVH34RFpy93YBd2nnVGLgyGVwagcPw==} + dev: true + + /@cspell/dict-fullstack/2.0.4: + resolution: {integrity: sha512-+JtYO58QAXnetRN+MGVzI8YbkbFTLpYfl/Cw/tmNqy7U1IDVC4sTXQ2pZvbbeKQWFHBqYvBs0YASV+mTouXYBw==} + dev: true + + /@cspell/dict-golang/2.0.0: + resolution: {integrity: sha512-rUeZJR/S/ZjAsOURtxsAO6xDQhL0IzF458ScahaeOqe0zVL3tx7tCLikCgT92NWPs3BNqmsZGqYSDbn/1KsSIA==} + dev: true + + /@cspell/dict-haskell/2.0.0: + resolution: {integrity: sha512-cjX1Br+gSWqtcmJD/IMHz1UoP3pUaKIIKy/JfhEs7ANtRt6hhfEKe9dl2kQzDkkKt4pXol+YgdYxL/sVc/nLgQ==} + dev: true + + /@cspell/dict-html-symbol-entities/2.0.0: + resolution: {integrity: sha512-71S5wGCe7dq6C+zGDwsEAe5msub/irrLi6SExeG11a/EkpA3RKAEheDGPk0hOY4+vOcIFHaApxOjLTtgQfYWfA==} + dev: true + + /@cspell/dict-html/3.0.0: + resolution: {integrity: sha512-VzZs/UtyRe4spdaH5SWakik+K3vB2fTyW3kdgGQbzjPGHyb5OXI5fmxQcX0yaSv5RkL0igVROHhu2ARUudoTpw==} + dev: true + + /@cspell/dict-java/2.0.0: + resolution: {integrity: sha512-9f5LDATlAiXRGqxLxgqbOLlQxuMW2zcN7tBgxwtN+4u90vM03ZUOR/gKIuDV/y0ZuAiWBIjA73cjk8DJ13Q1eA==} + dev: true + + /@cspell/dict-latex/2.0.0: + resolution: {integrity: sha512-H6RRwbHhQ9ARoO1R57SDqB+q/J5jUDdVnkdfukJkA+HNlJBhCcDuzGOIJqr+GBkJYDkF3obZ3LEOk2lUfT+Eyg==} + dev: true + + /@cspell/dict-lorem-ipsum/2.0.0: + resolution: {integrity: sha512-jKogAKtqvgPMleL6usyj3rZ0m8sVUR6drrD+wMnWSfdx1BmUyTsYiuh/mPEfLAebaYHELWSLQG3rDZRvV9Riqg==} + dev: true + + /@cspell/dict-lua/2.0.0: + resolution: {integrity: sha512-7WUEBEspSKtsq104WdIys1+DLqAxpJPzw74Py1TuE3fI5GvlzeSZkRFP2ya54GB2lCO4C3mq4M8EnitpibVDfw==} + dev: true + + /@cspell/dict-node/2.0.0: + resolution: {integrity: sha512-tPPl3liJORa/l6AoYqh/7rjoM7bdtaIXnIN6ox7CE0flZcBS5rWOB6mzEY3rpu/XJX0pjbBiIoqrolDkVl1RTQ==} + dev: true + + /@cspell/dict-npm/2.0.1: + resolution: {integrity: sha512-LRaJFSQfI0BIbbksPFE6fUjAyRFZRcknfOnYC/5c1wB/vsKH6KsqxTeCWNmHTYrk4KdBLZROhsHJXQIoqVTd4w==} + dev: true + + /@cspell/dict-php/2.0.0: + resolution: {integrity: sha512-29WgU77eTO985LvMHwPi1pcpfopfCWfTdffDyqya0JIfOSaFUrlYKzGPkE4mRxcz2G3hXsaM0SRvBNdIRwEdUg==} + dev: true + + /@cspell/dict-powershell/2.0.0: + resolution: {integrity: sha512-6uvEhLiGmG3u9TFkM1TYcky6aL9Yk7Sk3KJwoTYBaQJY2KqrprgyQtW6yxIw9oU52VRHlq3KKvSAA9Q26+SIkQ==} + dev: true + + /@cspell/dict-public-licenses/1.0.4: + resolution: {integrity: sha512-h4xULfVEDUeWyvp1OO19pcGDqWcBEQ7WGMp3QBHyYpjsamlzsyYYjCRSY2ZvpM7wruDmywSRFmRHJ/+uNFT7nA==} + dev: true + + /@cspell/dict-python/2.0.6: + resolution: {integrity: sha512-54ICgMRiGwavorg8UJC38Fwx8tW8WKj8pimJmFUd0F/ImQ8wmeg4VrmyMach5MZVUaw1qUe2aP5uSyqA15Q0mg==} + dev: true + + /@cspell/dict-r/1.0.2: + resolution: {integrity: sha512-Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ==} + dev: true + + /@cspell/dict-ruby/2.0.1: + resolution: {integrity: sha512-qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ==} + dev: true + + /@cspell/dict-rust/2.0.0: + resolution: {integrity: sha512-EWlQivTKXMU3TTcq/Pi6KPKTQADknasQ700UrxRPzxhwQ4sKVZ88GDu6VZJlsbFUz8Vko289KS6wjiox/7WpmQ==} + dev: true + + /@cspell/dict-scala/2.0.0: + resolution: {integrity: sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==} + dev: true + + /@cspell/dict-software-terms/2.1.3: + resolution: {integrity: sha512-JmMfRa9Xl0MCD/z5gYUnY05BNxSMnx25Ky6kO/Cs0gBYZZdYzHZNqrbfnqBMsB9PpOzn2uqrYUmAEusoI1WyMQ==} + dev: true + + /@cspell/dict-swift/1.0.2: + resolution: {integrity: sha512-IrMcRO7AYB2qU5cj4ttZyEbd04DRNOG6Iha106qGGmn4P096m+Y7lOnSLJx/rZbD/cAT3Z/7i465Lr1J93j7yg==} + dev: true + + /@cspell/dict-typescript/2.0.0: + resolution: {integrity: sha512-WFBahxsnD2y4Os14tE5Zxh31Ggn4DzGOAu3UoxYl1lLLxaszx4RH7LmAeFuznySboiaBeRBbpfJOjQA796O6VQ==} + dev: true + + /@cspell/dict-vue/2.0.2: + resolution: {integrity: sha512-/MB0RS0Gn01s4pgmjy0FvsLfr3RRMrRphEuvTRserNcM8XVtoIVAtrjig/Gg0DPwDrN8Clm0L1j7iQay6S8D0g==} + dev: true + /@eslint/eslintrc/1.2.1: resolution: {integrity: sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -2161,6 +2374,10 @@ packages: is-string: 1.0.7 dev: true + /array-timsort/1.0.3: + resolution: {integrity: sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==} + dev: true + /array-union/2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} @@ -2558,6 +2775,14 @@ packages: engines: {node: '>=6'} dev: true + /clear-module/4.1.2: + resolution: {integrity: sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==} + engines: {node: '>=8'} + dependencies: + parent-module: 2.0.0 + resolve-from: 5.0.0 + dev: true + /cli-boxes/2.2.1: resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==} engines: {node: '>=6'} @@ -2676,6 +2901,17 @@ packages: engines: {node: ^12.20.0 || >=14} dev: true + /comment-json/4.2.2: + resolution: {integrity: sha512-H8T+kl3nZesZu41zO2oNXIJWojNeK3mHxCLrsBNu6feksBXsgb+PtYz5daP5P86A0F3sz3840KVYehr04enISQ==} + engines: {node: '>= 6'} + dependencies: + array-timsort: 1.0.3 + core-util-is: 1.0.3 + esprima: 4.0.1 + has-own-prop: 2.0.0 + repeat-string: 1.6.1 + dev: true + /comment-parser/1.3.0: resolution: {integrity: sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==} engines: {node: '>= 12.0.0'} @@ -2793,6 +3029,82 @@ packages: type-fest: 0.8.1 dev: true + /cspell-gitignore/5.18.5: + resolution: {integrity: sha512-YKYFYMswkia0Uc5CMOapLwo8OKRfP+QbqyODTJ7IJACT7KCOSEj7A3B250LR2mWyvThyIUB+2c7+6ePdFCnh2g==} + engines: {node: '>=12.13.0'} + hasBin: true + dependencies: + cspell-glob: 5.18.5 + find-up: 5.0.0 + dev: true + + /cspell-glob/5.18.5: + resolution: {integrity: sha512-Tr/wMHpJ5zvD4qV4d5is1WJ6OQZSQSjiWoLCQ8pslpltGJhjYXPh3W9A8n4Ghr4AUUJNLKEQyCX+Z1kcA3hgOQ==} + engines: {node: '>=12.13.0'} + dependencies: + micromatch: 4.0.4 + dev: true + + /cspell-io/5.18.5: + resolution: {integrity: sha512-Ar2shXmKtLP935Linv+162xY6SNqIrwLI3rBRXs0/KnD/YdcLJQB0iBgFqvfvg7TcPg+EZOf9Oc6EvTLg2eprg==} + engines: {node: '>=12.13.0'} + dev: true + + /cspell-lib/5.18.5: + resolution: {integrity: sha512-yrUk3MbRXy/YGNIcLfURDnw4fRiXcbHo9K5B6IhwYfHKc3VM6QgvEQ0ce44uzZ+AEZzWuQ++GbhUih+bSJ87DQ==} + engines: {node: '>=12.13.0'} + dependencies: + '@cspell/cspell-bundled-dicts': 5.18.5 + '@cspell/cspell-types': 5.18.5 + clear-module: 4.1.2 + comment-json: 4.2.2 + configstore: 5.0.1 + cosmiconfig: 7.0.1 + cspell-glob: 5.18.5 + cspell-io: 5.18.5 + cspell-trie-lib: 5.18.5 + fast-equals: 3.0.0 + find-up: 5.0.0 + fs-extra: 10.0.1 + gensequence: 3.1.1 + import-fresh: 3.3.0 + resolve-from: 5.0.0 + resolve-global: 1.0.0 + vscode-uri: 3.0.3 + dev: true + + /cspell-trie-lib/5.18.5: + resolution: {integrity: sha512-FifImmkcArPYiE8fLXcbB/yS15QyWwvHw/gpCPEkcuJMJH2gxC+HOE909JnBsyPyjCaX5gHWiIf7ePjdXlWsDg==} + engines: {node: '>=12.13.0'} + dependencies: + '@cspell/cspell-pipe': 5.18.5 + fs-extra: 10.0.1 + gensequence: 3.1.1 + dev: true + + /cspell/5.18.5: + resolution: {integrity: sha512-rfk7sSZO304olxBXUFfec3YZL0gIyvjggwicGEgsweuh0Efdeq0zMmUV2sMckSOH9TVJdxW/DxTqjG+DLz8w+A==} + engines: {node: '>=12.13.0'} + hasBin: true + dependencies: + '@cspell/cspell-pipe': 5.18.5 + chalk: 4.1.2 + commander: 9.0.0 + comment-json: 4.2.2 + cspell-gitignore: 5.18.5 + cspell-glob: 5.18.5 + cspell-lib: 5.18.5 + fast-json-stable-stringify: 2.1.0 + file-entry-cache: 6.0.1 + fs-extra: 10.0.1 + get-stdin: 8.0.0 + glob: 7.2.0 + imurmurhash: 0.1.4 + semver: 7.3.5 + strip-ansi: 6.0.1 + vscode-uri: 3.0.3 + dev: true + /css-declaration-sorter/6.1.4_postcss@8.4.8: resolution: {integrity: sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==} engines: {node: '>= 10'} @@ -3769,6 +4081,10 @@ packages: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true + /fast-equals/3.0.0: + resolution: {integrity: sha512-Af7nSOpf7617idrFg0MJY6x7yVDPoO80aSwtKTC0afT8B/SsmvTpA+2a+uPLmhVF5IHmY5NPuBAA3dJrp55rJA==} + dev: true + /fast-glob/3.2.11: resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==} engines: {node: '>=8.6.0'} @@ -3899,6 +4215,15 @@ packages: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} dev: true + /fs-extra/10.0.1: + resolution: {integrity: sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==} + engines: {node: '>=12'} + dependencies: + graceful-fs: 4.2.9 + jsonfile: 6.1.0 + universalify: 2.0.0 + dev: true + /fs-extra/9.1.0: resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==} engines: {node: '>=10'} @@ -3950,6 +4275,11 @@ packages: wide-align: 1.1.5 dev: true + /gensequence/3.1.1: + resolution: {integrity: sha512-ys3h0hiteRwmY6BsvSttPmkhC0vEQHPJduANBRtH/dlDPZ0UBIb/dXy80IcckXyuQ6LKg+PloRqvGER9IS7F7g==} + engines: {node: '>=10.0.0'} + dev: true + /gensync/1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -4038,6 +4368,13 @@ packages: path-is-absolute: 1.0.1 dev: true + /global-dirs/0.1.1: + resolution: {integrity: sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=} + engines: {node: '>=4'} + dependencies: + ini: 1.3.8 + dev: true + /global-dirs/3.0.0: resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==} engines: {node: '>=10'} @@ -4118,6 +4455,11 @@ packages: engines: {node: '>=8'} dev: true + /has-own-prop/2.0.0: + resolution: {integrity: sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==} + engines: {node: '>=8'} + dev: true + /has-symbols/1.0.3: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} @@ -6167,6 +6509,13 @@ packages: callsites: 3.1.0 dev: true + /parent-module/2.0.0: + resolution: {integrity: sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==} + engines: {node: '>=8'} + dependencies: + callsites: 3.1.0 + dev: true + /parse-entities/2.0.0: resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==} dependencies: @@ -6882,6 +7231,11 @@ packages: engines: {node: '>=8'} dev: true + /repeat-string/1.6.1: + resolution: {integrity: sha1-jcrkcOHIirwtYA//Sndihtp15jc=} + engines: {node: '>=0.10'} + dev: true + /require-directory/2.1.1: resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=} engines: {node: '>=0.10.0'} @@ -6909,6 +7263,13 @@ packages: engines: {node: '>=8'} dev: true + /resolve-global/1.0.0: + resolution: {integrity: sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==} + engines: {node: '>=8'} + dependencies: + global-dirs: 0.1.1 + dev: true + /resolve.exports/1.1.0: resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==} engines: {node: '>=10'} diff --git a/src/llvm/llvm.ts b/src/llvm/llvm.ts index 82dce30e..105dbe83 100644 --- a/src/llvm/llvm.ts +++ b/src/llvm/llvm.ts @@ -169,7 +169,7 @@ function getLinuxUrl(versionGiven: string): string { } else if (version !== "" && version in UBUNTU) { ubuntu = UBUNTU[version] } else { - // default to the maximum vresion + // default to the maximum version ubuntu = UBUNTU[MAX_UBUNTU] } diff --git a/src/vcpkg/__tests__/vcpkg.test.ts b/src/vcpkg/__tests__/vcpkg.test.ts index 53129400..a988847f 100644 --- a/src/vcpkg/__tests__/vcpkg.test.ts +++ b/src/vcpkg/__tests__/vcpkg.test.ts @@ -2,7 +2,7 @@ import { setupVcpkg } from "../vcpkg" import { testBin, setupTmpDir } from "../../utils/tests/test-helpers" jest.setTimeout(300000) -async function testvcpkg(directory: string) { +async function testVcpkg(directory: string) { const { binDir } = await setupVcpkg("", directory, "") await testBin("vcpkg", ["--version"], binDir) return binDir @@ -15,6 +15,6 @@ describe("setup-vcpkg", () => { }) it("should setup vcpkg", async () => { - await testvcpkg(directory) + await testVcpkg(directory) }) })