Skip to content

Commit

Permalink
update josh instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Sep 29, 2022
1 parent 52c8875 commit 6c79a9b
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -279,24 +279,28 @@ With this, you should now have a working development setup! See

### Fetching the latest changes from the rustc repo

Run the josh proxy locally
The first time, register the josh proxy as a remote

```
docker run -p 8000:8000 -e JOSH_REMOTE=https://github.com -v josh-vol:/data/git joshproject/josh-proxy:latest
git remote add josh http://localhost:8000/rust-lang/rust.git:/src/tools/miri.git
```

Register the josh proxy as a remote
Each time, run the josh proxy locally (in another terminal)

```
git remote add josh http://localhost:8000/rust-lang/rust.git:/src/tools/miri.git
docker run -it -p 8000:8000 -e JOSH_REMOTE=https://github.com -v josh-vol:/data/git joshproject/josh-proxy:latest
```

Fetch (takes ca 5-10 min the first time)
And then integrate the recent changes and update the `rust-version` file

```
git fetch josh
git checkout josh/master
git switch -c josh_sync
git checkout master
git pull
git fetch josh # takes ca 5-10 min the first time
git merge josh/master
./rustup-toolchain HEAD && ./miri fmt
git commit -am "rustup"
```

Now push `josh_sync` to your own miri fork and open a PR with it.
Now push to your own miri fork and open a PR with it.
You can stop the josh proxy with Ctrl-C.

0 comments on commit 6c79a9b

Please sign in to comment.