Skip to content

Commit

Permalink
Merge pull request #8 from aminya/msvc
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya authored Dec 6, 2021
2 parents 7d0cc67 + 631a302 commit 3d8864e
Show file tree
Hide file tree
Showing 21 changed files with 508 additions and 195 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ jobs:
run: |
pnpm install
# - name: Setup SSH debugging session
# uses: mxschmitt/action-tmate@v3

- name: Test
run: |
pnpm run test
Expand Down
8 changes: 0 additions & 8 deletions .gitmodules

This file was deleted.

9 changes: 5 additions & 4 deletions LICENSE.dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ setup-cpp reused some code from the following projects:
- [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
- [setup-python](https://github.com/actions/setup-python): MIT

This package also uses the depedencies 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
license-checker --summary --production --excludePackages "[email protected]"
```

```
├─ MIT: 8
├─ MIT: 9
├─ ISC: 2
└─ Apache-2.0: 1
```
```

[email protected] is MIT license.
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ The package can be used locally or from CI services like GitHub Actions. Stay tu

`setup-cpp` can install all of these tools:

- llvm
- gcc
- cmake
- ninja
- llvm
- gcc
- msvc
- vcvarsall
- vcpkg
- meson
- conan
Expand Down Expand Up @@ -182,7 +184,3 @@ After build, run the following to start an interactive shell in your container
```ps1
docker run -it setup_cpp
```

### Incomplete

- `msvc`. It is implemented, but it has bugs. See [this issue](https://github.com/aminya/setup-cpp/issues/1)
3 changes: 3 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ inputs:
msvc:
description: "The msvc version to install"
required: false
vcvarsall:
description: "If should run vcvarsall?"
required: false
cmake:
description: "The cmake version to install."
required: false
Expand Down
2 changes: 1 addition & 1 deletion dist/setup_cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/setup_cpp.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"format": "prettier --write .",
"lint": "eslint . --fix",
"pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./building/scripts/pack-exe.js",
"prepare": "git submodule update --init --recursive && npm run build",
"prepare": "npm run build",
"start.docker": "docker run -t setup_cpp .",
"test": "run-p test.format test.lint test.tsc test.unit",
"test.format": "prettier . --check",
Expand All @@ -36,7 +36,9 @@
"execa": "^5.1.1",
"hasha": "^5.2.2",
"mri": "^1.2.0",
"msvc-dev-cmd": " https://github.com/aminya/msvc-dev-cmd",
"semver": "^7.3.5",
"setup-python": "https://github.com/actions/setup-python",
"untildify": "^4.0.0",
"which": "^2.0.2"
},
Expand Down
Loading

0 comments on commit 3d8864e

Please sign in to comment.