diff options
| author | Tshepang Mbambo <tshepang@gmail.com> | 2025-04-26 13:42:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-26 13:42:45 +0200 |
| commit | 7a70f336ccc89533e656326c38b5268495c0a357 (patch) | |
| tree | 390f55a43d06bdf8ff32e53838568fcbd9a6f203 | |
| parent | e6472b35e7cd77240d0fd1e923e8cea7f2079c95 (diff) | |
| parent | 1b5f2aa2a78881962568c691a58d6edb64c1dbc9 (diff) | |
| download | rust-7a70f336ccc89533e656326c38b5268495c0a357.tar.gz rust-7a70f336ccc89533e656326c38b5268495c0a357.zip | |
Merge pull request #2345 from rust-lang/extraneous
toolchain version does not need to be specified
| -rw-r--r-- | src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml | 2 | ||||
| -rw-r--r-- | src/doc/rustc-dev-guide/README.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml b/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml index b19eccf9eb8..1e430d8b4e6 100644 --- a/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml +++ b/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml @@ -28,7 +28,7 @@ jobs: # Cache the josh directory with checked out rustc cache-directories: "/home/runner/.cache/rustc-dev-guide-josh" - name: Install josh - run: RUSTFLAGS="--cap-lints warn" cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04 + run: RUSTFLAGS="--cap-lints warn" cargo install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04 - name: Setup bot git name and email run: | git config --global user.name 'The rustc-dev-guide Cronjob Bot' diff --git a/src/doc/rustc-dev-guide/README.md b/src/doc/rustc-dev-guide/README.md index 9f468b933d7..08158801788 100644 --- a/src/doc/rustc-dev-guide/README.md +++ b/src/doc/rustc-dev-guide/README.md @@ -77,7 +77,7 @@ This repository is linked to `rust-lang/rust` as a [josh](https://josh-project.g You'll need to install `josh-proxy` locally via ``` -cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04 +cargo install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04 ``` Older versions of `josh-proxy` may not round trip commits losslessly so it is important to install this exact version. @@ -106,5 +106,5 @@ You may observe "Nothing to pull" even if you *know* rustc-pull has something to 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. ``` -GIT_CONFIG_GLOBAL=/path/to/minimal/gitconfig GIT_CONFIG_SYSTEM='' cargo +stable run --manifest-path josh-sync/Cargo.toml -- rustc-pull +GIT_CONFIG_GLOBAL=/path/to/minimal/gitconfig GIT_CONFIG_SYSTEM='' cargo run --manifest-path josh-sync/Cargo.toml -- rustc-pull ``` |