Skip to content

Commit f7f2d14

Browse files
committed
Merge branch 'master' into pr/164
2 parents 72b58a4 + 9292ace commit f7f2d14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+3099
-2178
lines changed

.eslintrc.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
{
22
"extends": "eslint-config-atomic",
3-
"ignorePatterns": ["dist/", "node_modules/", "dev/cpp_vcpkg_project"]
3+
"ignorePatterns": ["dist/", "node_modules/", "dev/cpp_vcpkg_project"],
4+
"rules": {
5+
"no-unused-vars": "off",
6+
"@typescript-eslint/no-unused-vars": [
7+
"warn",
8+
{
9+
"argsIgnorePattern": "^_",
10+
"varsIgnorePattern": "^_",
11+
"caughtErrorsIgnorePattern": "^_",
12+
"destructuredArrayIgnorePattern": "^_"
13+
}
14+
]
15+
}
416
}

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ stats.html
77
src/python/setup-python/
88
src/msvc/msvc-dev-cmd/
99
dev/cpp_vcpkg_project
10-
package.json

.terserrc.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

README.md

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,26 @@ Setting up a **cross-platform** environment for building and testing C++/C proje
2424
| coverage | gcovr, opencppcoverage, kcov |
2525
| other | python, powershell, sevenzip |
2626

27-
`setup-cpp` automatically installs the dependencies above tools if needed for the selected tool (e.g., `python` is required for `conan`).
27+
`setup-cpp` automatically handles the dependencies of the selected tool (e.g., `python` is required for `conan`).
2828

2929
## Usage
3030

3131
### From Terminal
3232

3333
#### With npm and Nodejs
3434

35-
Install setup-cpp with npm:
35+
Run `setup-cpp` with the available options.
3636

3737
```shell
38-
npm install -g setup-cpp
39-
```
40-
41-
Then run `setup-cpp` with the available options.
42-
43-
```shell
44-
# windows example (open PowerShell as admin)
45-
setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
38+
# Windows example (open PowerShell as admin)
39+
npx setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
4640

4741
RefreshEnv.cmd # activate the environment
4842
```
4943

5044
```shell
51-
# linux/macos example
52-
sudo setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
45+
# Linux/Macos example
46+
sudo npx setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
5347

5448
source ~/.cpprc
5549
```
@@ -62,21 +56,21 @@ NOTE: On Unix systems, if you are already a root user (e.g., in a GitLab runner
6256

6357
#### With executable
6458

65-
Download the executable for your platform from [here](https://github.com/aminya/setup-cpp/releases/tag/v0.26.2), and run it with the available options. You can also automate downloading using `wget`, `curl`, or other similar tools.
59+
Download the executable for your platform from [here](https://github.com/aminya/setup-cpp/releases/tag/v0.30.1), and run it with the available options. You can also automate downloading using `wget`, `curl`, or other similar tools.
6660

6761
An example that installs llvm, cmake, ninja, ccache, and vcpkg:
6862

6963
```shell
7064
# windows example (open PowerShell as admin)
71-
curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.26.2/setup-cpp-x64-windows.exe"
65+
curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.30.1/setup-cpp-x64-windows.exe"
7266
./setup-cpp-x64-windows --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
7367

7468
RefreshEnv.cmd # activate cpp environment variables
7569
```
7670

7771
```shell
7872
# linux example
79-
wget "https://github.com/aminya/setup-cpp/releases/download/v0.26.2/setup-cpp-x64-linux"
73+
wget "https://github.com/aminya/setup-cpp/releases/download/v0.30.1/setup-cpp-x64-linux"
8074
chmod +x ./setup-cpp-x64-linux
8175
sudo ./setup-cpp-x64-linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
8276

@@ -85,7 +79,7 @@ source ~/.cpprc # activate cpp environment variables
8579

8680
```shell
8781
# macos example
88-
wget "https://github.com/aminya/setup-cpp/releases/download/v0.26.2/setup-cpp-x64-macos"
82+
wget "https://github.com/aminya/setup-cpp/releases/download/v0.30.1/setup-cpp-x64-macos"
8983
chmod +x ./setup-cpp-x64-macos
9084
sudo ./setup-cpp-x64-macos --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
9185

@@ -255,7 +249,7 @@ stages:
255249
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
256250

257251
.setup-cpp: &setup-cpp |
258-
curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.26.2/setup-cpp-x64-linux"
252+
curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.30.1/setup-cpp-x64-linux"
259253
chmod +x setup-cpp-x64-linux
260254
./setup-cpp-x64-linux --compiler $compiler --cmake true --ninja true --ccache true --vcpkg true
261255
source ~/.cpprc

cspell.config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ ignorePaths:
1111
- "**/node_modules/"
1212
words:
1313
- aarch
14+
- clangd
15+
- Trofimovich
16+
- cobertura
17+
- whatwg
1418
- aminya
1519
- applellvm
1620
- bazel
File renamed without changes.

dist/node12/actions_python.cb0a8b6a.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/node12/actions_python.cb0a8b6a.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/node12/actions_python.eaf38279.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/actions_python.eaf38279.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)