diff options
| author | bors <bors@rust-lang.org> | 2021-08-04 09:02:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-04 09:02:48 +0000 |
| commit | 85569106a4af947e8f12380e4697931438b61f4d (patch) | |
| tree | f9a130e503801751f3de08777d4fb3a32d2a1a27 | |
| parent | 77af56d18191767af813db51eac4492e5e10d07b (diff) | |
| parent | 827f661d3e6db7fc8c5f10edab5f3674a57d8617 (diff) | |
| download | rust-85569106a4af947e8f12380e4697931438b61f4d.tar.gz rust-85569106a4af947e8f12380e4697931438b61f4d.zip | |
Auto merge of #7529 - giraffate:update_node_version, r=flip1995,llogiq
Use node v12.x in CI In https://github.com/rust-lang/rust-clippy/pull/7528#issuecomment-892281632, remark-cli version has been updated recently and it requires to use ESM module: https://github.com/remarkjs/remark/releases/tag/14.0.0. Node version in CI was v10.24.1, it seems to be old. changelog: none
| -rw-r--r-- | .github/workflows/remark.yml | 2 | ||||
| -rw-r--r-- | doc/basics.md | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/remark.yml b/.github/workflows/remark.yml index 77efdec1e50..56c00544c93 100644 --- a/.github/workflows/remark.yml +++ b/.github/workflows/remark.yml @@ -20,6 +20,8 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1.4.4 + with: + node-version: '12.x' - name: Install remark run: npm install remark-cli remark-lint remark-lint-maximum-line-length remark-preset-lint-recommended remark-gfm diff --git a/doc/basics.md b/doc/basics.md index 43d3792f595..ff2e0417435 100644 --- a/doc/basics.md +++ b/doc/basics.md @@ -166,8 +166,8 @@ rustup component add clippy ``` > **DO NOT** install using `cargo install --path . --force` since this will overwrite rustup -[proxies](https://rust-lang.github.io/rustup/concepts/proxies.html). That is, `~/.cargo/bin/cargo-clippy` and -`~/.cargo/bin/clippy-driver` should be hard or soft links to `~/.cargo/bin/rustup`. You can repair these by running -`rustup update`. +> [proxies](https://rust-lang.github.io/rustup/concepts/proxies.html). That is, `~/.cargo/bin/cargo-clippy` and +> `~/.cargo/bin/clippy-driver` should be hard or soft links to `~/.cargo/bin/rustup`. You can repair these by running +> `rustup update`. [glossary]: https://rustc-dev-guide.rust-lang.org/appendix/glossary.html |