diff options
| author | bors <bors@rust-lang.org> | 2022-12-21 16:59:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-21 16:59:31 +0000 |
| commit | 5b64c91c262a6a148a35d24180b23ffafbbab1dc (patch) | |
| tree | efaa6707ed90917144a0b2ffa9fbd96cf6418555 /src | |
| parent | e82a604a88fec3adc0645c5cc5328ea7eba5faa4 (diff) | |
| parent | 90d8fc6240874ec1dd636ba2b18ef56a0657d454 (diff) | |
| download | rust-5b64c91c262a6a148a35d24180b23ffafbbab1dc.tar.gz rust-5b64c91c262a6a148a35d24180b23ffafbbab1dc.zip | |
Auto merge of #2736 - RalfJung:josh, r=oli-obk
update josh instructions Fixes https://github.com/rust-lang/miri/issues/2730 r\? `@oli-obk`
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/CONTRIBUTING.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/miri/CONTRIBUTING.md b/src/tools/miri/CONTRIBUTING.md index 9d61cc4e2d5..6efaefdefff 100644 --- a/src/tools/miri/CONTRIBUTING.md +++ b/src/tools/miri/CONTRIBUTING.md @@ -232,16 +232,16 @@ You can also directly run Miri on a Rust source file: ## Advanced topic: Syncing with the rustc repo -We use the [`josh` proxy](https://github.com/josh-project/josh) to transmit -changes between the rustc and Miri repositories. For now, the latest git version -of josh needs to be built from source. This downloads and runs josh: +We use the [`josh` proxy](https://github.com/josh-project/josh) to transmit changes between the +rustc and Miri repositories. The eaisest way to run josh is via docker: ```sh -git clone https://github.com/josh-project/josh -cd josh -cargo run --release -p josh-proxy -- --local=local --remote=https://github.com --no-background +docker pull joshproject/josh-proxy:latest +docker run -it -p 8000:8000 -e JOSH_REMOTE=https://github.com -e JOSH_EXTRA_OPTS=--no-background -v josh-vol:/data/git joshproject/josh-proxy:latest ``` +This sets up a local volume `josh-vol` for josh's cache. + ### Importing changes from the rustc repo Josh needs to be running, as described above. |