Skip to content

Commit

Permalink
Auto merge of rust-lang#2736 - RalfJung:josh, r=oli-obk
Browse files Browse the repository at this point in the history
update josh instructions

Fixes rust-lang/miri#2730

r\? `@oli-obk`
  • Loading branch information
bors committed Dec 21, 2022
2 parents e82a604 + 90d8fc6 commit 5b64c91
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/tools/miri/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 5b64c91

Please sign in to comment.