Skip to content

Commit 1376352

Browse files
authored
Merge pull request #2345 from rust-lang/extraneous
toolchain version does not need to be specified
2 parents cc66430 + ac84606 commit 1376352

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/rustc-pull.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# Cache the josh directory with checked out rustc
2929
cache-directories: "/home/runner/.cache/rustc-dev-guide-josh"
3030
- name: Install josh
31-
run: RUSTFLAGS="--cap-lints warn" cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04
31+
run: RUSTFLAGS="--cap-lints warn" cargo install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04
3232
- name: Setup bot git name and email
3333
run: |
3434
git config --global user.name 'The rustc-dev-guide Cronjob Bot'

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ This repository is linked to `rust-lang/rust` as a [josh](https://josh-project.g
7777
You'll need to install `josh-proxy` locally via
7878

7979
```
80-
cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04
80+
cargo install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04
8181
```
8282
Older versions of `josh-proxy` may not round trip commits losslessly so it is important to install this exact version.
8383

@@ -106,5 +106,5 @@ You may observe "Nothing to pull" even if you *know* rustc-pull has something to
106106
To minimize the likelihood of this happening, you may wish to keep a separate *minimal* git config that *only* has `[user]` entries from global git config, then repoint system git to use the minimal git config instead. E.g.
107107
108108
```
109-
GIT_CONFIG_GLOBAL=/path/to/minimal/gitconfig GIT_CONFIG_SYSTEM='' cargo +stable run --manifest-path josh-sync/Cargo.toml -- rustc-pull
109+
GIT_CONFIG_GLOBAL=/path/to/minimal/gitconfig GIT_CONFIG_SYSTEM='' cargo run --manifest-path josh-sync/Cargo.toml -- rustc-pull
110110
```

0 commit comments

Comments
 (0)